added work item details field

Author: puthre

appinfo/database.xml

@@ -196,6 +196,12 @@
       <notnull>true</notnull>
       <length>256</length>
     </field>
+    <field>
+      <name>details</name>
+      <type>text</type>
+      <notnull>true</notnull>
+      <length>1024</length>
+    </field>
     <field>
       <name>project_id</name>
       <type>integer</type>

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Time Tracker</name>
     <summary>Time Tracker App</summary>
     <description><![CDATA[Time Tracker App]]></description>
-    <version>0.0.36</version>
+    <version>0.0.37</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >MTier Ltd.</author>
     <namespace>TimeTracker</namespace>

js/timer.js

@@ -53,8 +53,8 @@
                 text: "Confirm",
                 click: function() {
                     var baseUrl = OC.generateUrl('/apps/timetracker/ajax/add-work-interval/'+$('#name-manual-entry').val());
-
-                    var jqxhr = $.post( baseUrl,{start:picker.data('daterangepicker').startDate.format('DD/MM/YY HH:mm'), end:picker.data('daterangepicker').endDate.format('DD/MM/YY HH:mm'), tzoffset: new Date().getTimezoneOffset()} ,function() {
+                   
+                    var jqxhr = $.post( baseUrl,{start:picker.data('daterangepicker').startDate.format('DD/MM/YY HH:mm'), end:picker.data('daterangepicker').endDate.format('DD/MM/YY HH:mm'), tzoffset: new Date().getTimezoneOffset(), details:$('#details-manual-entry').val()} ,function() {
                         getWorkItems();
                         $("#dialog-manual-entry").dialog("close");
                     })
@@ -89,7 +89,7 @@
             form =  dialogWorkItemEditForm.find( "form" );
             var id = $(target).data('myid');
             var baseUrl = OC.generateUrl("/apps/timetracker/ajax/update-work-interval/"+id);
-            var jqxhr = $.post( baseUrl, {name:form.find("#name").val()},function() {
+            var jqxhr = $.post( baseUrl, {name:form.find("#name").val(),details:form.find("#details").val()},function() {
                 getWorkItems();
                 $(dialogWorkItemEditForm).dialog("close");
               })
@@ -195,7 +195,8 @@
 
                         $.each(workItem.children, function (ckey, child){
                             //debugger;
-                            children.push("<div class='wi-child'><li><div class='wi-child-element'><div class='wi-child-name clickable'  data-myid="+child.id+" data-name='"+child.name+"'>"+cutString(child.name,64)+"</div>"+
+                            children.push("<div class='wi-child'><li><div class='wi-child-element'><div class='wi-child-name clickable'  data-details='"+child.details+"' data-myid="+child.id+" data-name='"+child.name+"'>"+cutString(child.name,64)+
+                            "<div class='wi-child-details clickable' data-details='"+child.details+"' data-myid="+child.id+" data-name='"+child.name+"'>"+cutString(child.details,64)+"</div>"+"</div>"+
                             "<span class='fas clickable fa-trash wi-trash' id="+child.id+"></span><span class='set-project' data-myid="+child.id+" data-projectid="+child.projectId+" data-projectname='"+child.projectName+"'></span>"+
                             "<span class='set-tag' data-myid="+child.id+" data-tagids='"+child.tags.map(function(tag) {return tag.id}).join(',')+"' data-tagnames='"+child.tags.map(function(tag) {return tag.name}).join(',')+"'></span>"+
                             "<div class='wi-child-hours' data-myid="+child.id+" data-start-date='"+child.start+"' data-end-date='"+(child.start+child.duration)+"'>"+tsToHour(child.start)+"&nbsp;-&nbsp;"+
@@ -258,6 +259,7 @@
 
                     form = dialogWorkItemEditForm.find( "form" )
                     form.find("#name").val($(e.target).data("name"));
+                    form.find("#details").val($(e.target).data("details"));
                     dialogWorkItemEditForm.dialog("open");
                     return false;
 

lib/Controller/AjaxController.php

@@ -104,6 +104,7 @@ public function workIntervals() {
 			$wa = ['duration' => $wi->duration,
 					'id' => $wi->id,
 					'name' =>  $wi->name,
+					'details' =>  $wi->details,
 					'projectId' =>  $wi->projectId,
 					'running' =>  $wi->running,
 					'start' => $wi->start,
@@ -231,6 +232,12 @@ public function updateWorkInterval($id) {
 			}
 			$wi->setName($this->request->name);
 		}
+		if (isset($this->request->details)) {
+			if (strlen($this->request->details) > 1024){
+				return new JSONResponse(["Error" => "Details too long"]);
+			}
+			$wi->setDetails($this->request->details);
+		}
 		if (isset($this->request->projectId)) {
 			$wi->setProjectId($this->request->projectId);
 			if ($wi->projectId != null){
@@ -313,6 +320,12 @@ public function addWorkInterval() {
 		if (isset($this->request->name)) {
 			$wi->setName($this->request->name);
 		}
+		if (isset($this->request->details)) {
+			if (strlen($this->request->details) > 1024){
+				return new JSONResponse(["Error" => "Details too long"]);
+			}
+			$wi->setDetails($this->request->details);
+		}
 		if (isset($this->request->projectId)) {
 			$wi->setProjectId($this->request->projectId);
 			if ($wi->projectId != null){

lib/Db/WorkInterval.php

@@ -8,6 +8,7 @@ class WorkInterval extends Entity {
 
     public $id;
     public $name;
+    public $details;
     public $projectId;
     public $userUid;
     public $start;
@@ -20,6 +21,7 @@ public function __construct() {
 
         $this->addType('id', 'integer');
         $this->addType('name', 'string');
+        $this->addType('details', 'string');
         $this->addType('projectId', 'integer');
         $this->addType('userUid', 'string');
         $this->addType('start', 'integer');

templates/content/index.php

@@ -23,9 +23,12 @@
   <p class="validateTips">All form fields are required.</p>
  
   <form>
-    <fieldset>
+    <fieldset >
       <label for="name">Name</label>
       <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+      <div class="clear"></div>
+      <label for="details">Details</label>
+      <textarea  style='vertical-align: middle;width:300px;' name="details" id="details" cols="40" rows="5" value="" id="details" class="text ui-widget-content ui-corner-all"></textarea>
  
       <!-- Allow form submission with keyboard without duplicating the dialog button -->
       <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
@@ -40,6 +43,9 @@
     <fieldset>
       <label for="name">Name</label>
       <input type="text" name="name" id="name-manual-entry" value="" class="text ui-widget-content ui-corner-all">
+      <div class="clear"></div>
+      <label for="details">Details</label>
+      <textarea  style='vertical-align: middle;width:250px;' name="details" cols="40" rows="5" value="" id="details-manual-entry" class="text ui-widget-content ui-corner-all"></textarea>
       <!-- <div id='hours-manual-entry'>&nbsp;</div> -->
       <label for="hours">Interval</label>
       <input type="text" name="hours" id="hours-manual-entry" value="" class="text ui-widget-content ui-corner-all">