mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-11 05:58:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Standardize some issues with the event endpoints.

Browse Source
This commit is contained in:
NovaFox161
2018-03-16 17:14:34 -05:00
parent a0dbbc7352
commit bde81d2868
3 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/cloudcraftgaming/discal/web/endpoints/v1/EventEndpoint.java
View File

@@ -158,7 +158,7 @@ public class EventEndpoint {
JSONObject rjo = new JSONObject();
rjo.put("frequency", EventFrequency.DAILY.name());
rjo.put("recurCount", -1);
rjo.put("count", -1);
rjo.put("interval", 1);
jo.put("recurrence", rjo);
@@ -232,13 +232,13 @@ public class EventEndpoint {
event.setLocation(body.getString("location"));
}
//TODO: STANDARDIZE THIS
if (body.getBoolean("enableRecurrence")) {
JSONObject recur = body.getJSONObject("recurrence");
if (recur.getBoolean("recur")) {
//Handle recur
Recurrence recurrence = new Recurrence();
recurrence.setFrequency(EventFrequency.fromValue(body.getString("frequency")));
recurrence.setCount(body.getInt("count"));
recurrence.setInterval(body.getInt("interval"));
recurrence.setFrequency(EventFrequency.fromValue(recur.getString("frequency")));
recurrence.setCount(recur.getInt("count"));
recurrence.setInterval(recur.getInt("interval"));
String[] rr = new String[]{recurrence.toRRule()};
event.setRecurrence(Arrays.asList(rr));
@@ -318,13 +318,13 @@ public class EventEndpoint {
event.setLocation(body.getString("location"));
}
//TODO: STANDARDIZE THIS
if (body.getBoolean("enableRecurrence")) {
JSONObject recur = body.getJSONObject("recurrence");
if (recur.getBoolean("recur")) {
//Handle recur
Recurrence recurrence = new Recurrence();
recurrence.setFrequency(EventFrequency.fromValue(body.getString("frequency")));
recurrence.setCount(body.getInt("count"));
recurrence.setInterval(body.getInt("interval"));
recurrence.setFrequency(EventFrequency.fromValue(recur.getString("frequency")));
recurrence.setCount(recur.getInt("count"));
recurrence.setInterval(recur.getInt("interval"));
String[] rr = new String[]{recurrence.toRRule()};
event.setRecurrence(Arrays.asList(rr));

4
src/main/resources/web/public/pages/docs/api/v1/events.html
View File

@@ -234,7 +234,8 @@
"isParent": true,
"recurrence": {
"recur": false,
"recurCount": -1,
"frequency": "DAILY",
"count": -1,
"interval": 1,
},
"image": "https://goo.gl/nqi64A"
@@ -380,6 +381,7 @@
"color": "RED",
"recurrence": {
"recur": false,
"frequency": "DAILY",
"count": -1,
"interval": 1,
},

32
src/main/resources/web/public/scripts/dashboard/calendar.js
View File

@@ -434,7 +434,7 @@ function getEventsForSelectedDate() {
var count = document.createElement("input");
count.name = "count";
count.type = "number";
count.valueAsNumber = parseInt(event.recurrence.recurCount);
count.valueAsNumber = parseInt(event.recurrence.count);
count.min = "-1";
count.id = "editCount-" + event.id;
count.disabled = true;
@@ -570,10 +570,12 @@ function updateEvent(editSubmitId) {
"location": document.getElementById("editLocation-" + eventId).value,
"image": document.getElementById("editImage-" + eventId).value,
"color": colorElement.options[colorElement.selectedIndex].value,
"enableRecurrence": document.getElementById("editEnableRecur-" + eventId).checked,
"frequency": freqElement.options[freqElement.selectedIndex].value,
"count": document.getElementById("editCount-" + eventId).valueAsNumber,
"interval": document.getElementById("editInterval-" + eventId).valueAsNumber,
recurrence: {
"recur": document.getElementById("editEnableRecur-" + eventId).checked,
"frequency": freqElement.options[freqElement.selectedIndex].value,
"count": document.getElementById("editCount-" + eventId).valueAsNumber,
"interval": document.getElementById("editInterval-" + eventId).valueAsNumber,
},
"epochStart": startDate.getTime() + 86400000,
"epochEnd": endDate.getTime() + 86400000
};
@@ -585,10 +587,12 @@ function updateEvent(editSubmitId) {
"location": document.getElementById("editLocation-" + eventId).value,
"image": document.getElementById("editImage-" + eventId).value,
"color": colorElement.options[colorElement.selectedIndex].value,
"enableRecurrence": false,
"frequency": "DAILY",
"count": -1,
"interval": 1,
"recurrence": {
"recur": false,
"frequency": "DAILY",
"count": -1,
"interval": 1
},
"epochStart": startDate.getTime() + 86400000,
"epochEnd": endDate.getTime() + 86400000
};
@@ -630,10 +634,12 @@ function createNewEvent() {
"location": document.getElementById("create-location").value,
"image": document.getElementById("create-image").value,
"color": colorElement.options[colorElement.selectedIndex].value,
"enableRecurrence": document.getElementById("create-enableRecur").checked,
"frequency": freqElement.options[freqElement.selectedIndex].value,
"count": document.getElementById("create-count").valueAsNumber,
"interval": document.getElementById("create-interval").valueAsNumber,
"recurrence": {
"recur": document.getElementById("create-enableRecur").checked,
"frequency": freqElement.options[freqElement.selectedIndex].value,
"count": document.getElementById("create-count").valueAsNumber,
"interval": document.getElementById("create-interval").valueAsNumber,
},
"epochStart": startDate.getTime() + 86400000,
"epochEnd": endDate.getTime() + 86400000
};