[upd] upd recurring events

Author: ArtyomBorisevich

basic.html

@@ -32,7 +32,7 @@
 	</div>
 	<script>
 		scheduler.setLoadMode("day");
-		scheduler.init("scheduler_here", new Date(),"month");
+		scheduler.init("scheduler_here", new Date(),"week");
 		scheduler.load("data/api.php");
 
 		var dp = scheduler.createDataProcessor({

data/api_recurring.php

@@ -22,18 +22,21 @@ function create($db, $event){
 		`start_date`=?,
 		`end_date`=?,
 		`text`=?,
-
-		`event_pid`=?,
-		`event_length`=?,
-		`rec_type`=?";
+		`duration`=?,
+		`rrule`=?,
+		`recurring_event_id`=?,
+		`original_start`=?,
+		`deleted`=?";
 	$queryParams = [
 		$event["start_date"],
 		$event["end_date"],
 		$event["text"],
 		// recurring events columns
-		$event["event_pid"] ? $event["event_pid"] : 0,
-		$event["event_length"] ? $event["event_length"] : 0,
-		$event["rec_type"]
+		$event["duration"] ? $event["duration"] : null,
+		$event["rrule"] ? $event["rrule"] : null,
+		$event["recurring_event_id"] ? $event["recurring_event_id"] : null,
+		$event["original_start"] ? $event["original_start"] : null,
+		$event["deleted"] = array_key_exists("deleted", $event) ? $event["deleted"] : null,
 	];
 
 	$query = $db->prepare($queryText);
@@ -47,25 +50,29 @@ function update($db, $event, $id){
 		`start_date`=?,
 		`end_date`=?,
 		`text`=?,
-		`event_pid`=?,
-		`event_length`=?,
-		`rec_type`=?
+		`duration`=?,
+		`rrule`=?,
+		`recurring_event_id`=?,
+		`original_start`=?,
+		`deleted`=?
 		WHERE `id`=?";
 
 	$queryParams = [
 		$event["start_date"],
 		$event["end_date"],
 		$event["text"],
 
-		$event["event_pid"] ? $event["event_pid"] : 0,
-		$event["event_length"] ? $event["event_length"] : 0,
-		$event["rec_type"],//!
+		$event["duration"] ? $event["duration"] : null,
+		$event["rrule"] ? $event["rrule"] : null,
+		$event["recurring_event_id"] ? $event["recurring_event_id"] : null,
+		$event["original_start"] ? $event["original_start"] : null,
+		$event["deleted"] ? $event["deleted"] : null,
 		$id
 	];
-	if ($event["rec_type"] && $event["rec_type"] != "none") {
-		//all modified occurrences must be deleted when you update recurring series
-		//https://docs.dhtmlx.com/scheduler/server_integration.html#savingrecurringevents
-		$subQueryText = "DELETE FROM `recurring_events` WHERE `event_pid`=? ;";
+	if ($event["rrule"] && $event["recurring_event_id"] == null) {
+		//all modified occurrences must be deleted when you update recurring  series
+		//https://docs.dhtmlx.com/scheduler/server_integration.html#recurringevents
+		$subQueryText = "DELETE FROM `events` WHERE `recurring_event_id`=? ;";
 		$subQuery = $db->prepare($subQueryText);
 		$subQuery->execute([$id]);
 	}
@@ -82,26 +89,24 @@ function delete($db, $id){
 	$subQuery->execute([$id]);
 	$event = $subQuery->fetch();
 
-	if ($event["event_pid"]) {
+	if ($event["recurring_event_id"]) {
 		// deleting a modified occurrence from a recurring series
 		// If an event with the event_pid value was deleted - it needs updating
 		// with rec_type==none instead of deleting.
-		$subQueryText="UPDATE `recurring_events` SET `rec_type`='none' WHERE `id`=?;";
+		$subQueryText="UPDATE `recurring_events` SET `deleted`= 1 WHERE `id`=?;";
 		$subQuery = $db->prepare($subQueryText);
 		$subQuery->execute([$id]);
-
-	}else{
-		if ($event["rec_type"] && $event["rec_type"] != "none") {//!
-			// if a recurring series deleted, delete all modified occurrences of the series
-			$subQueryText = "DELETE FROM `recurring_events` WHERE `event_pid`=? ;";
-			$subQuery = $db->prepare($subQueryText);
-			$subQuery->execute([$id]);
+  }else{
+		if ($event["rrule"]) {
+				// if a recurring series deleted, delete all modified occurrences
+				// of the series
+				$subQueryText = "DELETE FROM `recurring_events` WHERE `recurring_event_id`=? ;";
+				$subQuery = $db->prepare($subQueryText);
+				$subQuery->execute([$id]);
 		}
-
 		/*
 		end of recurring events data processing
 		*/
-
 		$queryText = "DELETE FROM `recurring_events` WHERE `id`=? ;";
 		$query = $db->prepare($queryText);
 		$query->execute([$id]);
@@ -128,9 +133,9 @@ function delete($db, $id){
 				$databaseId = create($db, $body);
 				$result["tid"] = $databaseId;
 				// delete a single occurrence from  recurring series
-				if ($body["rec_type"] === "none") {
-					$result["action"] = "deleted";//!
-				}
+				if (isset($body["deleted"]) && $body["deleted"]) {
+          $result["action"] = "deleted";
+        }
 			} elseif($action == "updated") {
 				update($db, $body, $id);
 			} elseif($action == "deleted") {

mysql_dump.sql

@@ -12,12 +12,14 @@ CREATE TABLE `events` (
 
 DROP TABLE IF EXISTS `recurring_events`;
 CREATE TABLE `recurring_events` (
-  `id` int(11) AUTO_INCREMENT,
+  `id` bigint(20) unsigned AUTO_INCREMENT,
+  `text` varchar(255) DEFAULT NULL,
   `start_date` datetime NOT NULL,
   `end_date` datetime NOT NULL,
-  `text` varchar(255) DEFAULT NULL,
-  `event_pid` int(11) DEFAULT 0,
-  `event_length` bigint(20) unsigned DEFAULT 0,
-  `rec_type` varchar(25) DEFAULT '""',
+  `duration` bigint(20) unsigned DEFAULT NULL,
+  `rrule` varchar(255) DEFAULT NULL,
+  `recurring_event_id` varchar(255) DEFAULT NULL,
+  `original_start` varchar(255) DEFAULT NULL,
+  `deleted` BOOLEAN DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;

recurring.html

@@ -35,10 +35,10 @@
 			recurring: true
 		});
 		scheduler.setLoadMode("day");
-		scheduler.init("scheduler_here", new Date(), "month");
+		scheduler.init("scheduler_here", new Date(), "week");
 		scheduler.load("data/api_recurring.php");
 
-		var dp = scheduler.createDataProcessor({
+		const dp = scheduler.createDataProcessor({
 			url: "data/api_recurring.php",
 			mode: "JSON"
 		});