Fixed #102

ajax.php

@@ -296,7 +296,7 @@ switch($_REQUEST['action']) {
     case 'getEvents':
         header("Status: 200 OK");
 
-        $upcomingReminders = getObjectsAsArray(Reminder::getUpcomingRemindersByUserID($_REQUEST['userID']), array("id", "userID", "reminderDate", "remindedYet"));
+        $upcomingReminders = getObjectsAsArray(Reminder::getUpcomingRemindersByUserID($_REQUEST['userID']), array("id", "userID", "reminderDate", "remindedYet", "subject"));
 
         $return = array(
             "type"      => $upcomingReminders == "" ? "ping" : "reminder",

includes/call.inc.php

@@ -58,7 +58,7 @@ class Call {
          global $db;
 
          if($reminderID == -1) {
-             Reminder::addReminder($userID, date("Y-m-d H:i:s", strtotime("+30 minutes")));
+             Reminder::addReminder($userID, date("Y-m-d H:i:s", strtotime("+30 minutes")), "Anruf am " . date("d.m.Y H:i:s"));
              $reminderID = Reminder::getLastReminder()->getID();
          }
 

includes/reminder.inc.php

@@ -5,12 +5,14 @@ class Reminder {
     private $userID         = NULL;
     private $reminderDate   = NULL;
     private $remindedYet    = NULL;
+    private $subject        = NULL;
 
-    public function __construct($id, $userID, $reminderDate, $remindedYet) {
+    public function __construct($id, $userID, $reminderDate, $remindedYet, $subject) {
         $this->id           = $id;
         $this->userID       = $userID;
         $this->reminderDate = $reminderDate;
         $this->remindedYet  = $remindedYet;
+        $this->subject      = $subject;
     }
 
     public function getID() {
@@ -37,6 +39,14 @@ class Reminder {
         $this->remindedYet = $remindedYet;
     }
 
+    public function getSubject() {
+        return $this->subject;
+    }
+
+    public function setSubject($subject) {
+        $this->subject = $setSubject;
+    }
+
     public function save() {
         global $db;
 
@@ -53,10 +63,10 @@ class Reminder {
      *
      */
 
-     public static function addReminder($userID, $reminderDate) {
+     public static function addReminder($userID, $reminderDate, $subject) {
          global $db;
 
-         $db->insertQuery("INSERT INTO `reminders`(`user_id`, `reminder_date`, `reminded_yet`) VALUES (" . $userID . ", '" . $reminderDate . "', 0);");
+         $db->insertQuery("INSERT INTO `reminders`(`user_id`, `reminder_date`, `reminded_yet`, `subject`) VALUES (" . $userID . ", '" . $reminderDate . "', 0, '" . $subject . "');");
 
      }
 
@@ -94,7 +104,7 @@ class Reminder {
         $return = array();
 
         foreach($reminders as $reminder) {
-            $return[] = new Reminder($reminder->id, $reminder->user_id, $reminder->reminder_date, $reminder->reminded_yet);
+            $return[] = new Reminder($reminder->id, $reminder->user_id, $reminder->reminder_date, $reminder->reminded_yet, $reminder->subject);
         }
 
         return $return[0];
@@ -121,7 +131,7 @@ class Reminder {
         }
 
         foreach($reminders as $reminder) {
-            $return[] = new Reminder($reminder->id, $reminder->user_id, $reminder->reminder_date, $reminder->reminded_yet);
+            $return[] = new Reminder($reminder->id, $reminder->user_id, $reminder->reminder_date, $reminder->reminded_yet, $reminder->subject);
         }
 
         return $return;

scripts/custom.js

@@ -16,11 +16,11 @@ $(document).ready(function() {
 
     window.noty_reminder = noty_reminder;
 
-    function noty_reminder(reminderID) {
+    function noty_reminder(reminderID, subject) {
         var reminderID = reminderID;
         reminders[reminderID] = noty({
             layout  : 'topCenter',
-            text    : 'Erinnerung:<br>',
+            text    : 'Erinnerung:<br>' + subject,
             type    : 'alert',
             buttons : [
                 {addClass: 'btn btn-primary', text: 'OK', onClick: function(noty) {
@@ -82,7 +82,7 @@ $(document).ready(function() {
                 case 'reminder':
                     r['reminders'].forEach(function(item) {
                         if(reminders[item['id']] == undefined) {
-                            noty_reminder(item['id']);
+                            noty_reminder(item['id'], item['subject']);
                         }
                     });
                     break;