Changeset 1692

Timestamp:

03/09/10 11:31:49 (5 months ago)

Author:

klemens

Message:

ullFlow -> ullTime integration: added date field

Location:

trunk/plugins/ullFlowPlugin

Files:

• lib/form/ullFlowForm.php (modified) (2 diffs)
• modules/ullFlow/lib/BaseUllFlowActions.class.php (modified) (3 diffs)
• modules/ullFlow/templates/editSuccess.php (modified) (1 diff)

trunk/plugins/ullFlowPlugin/lib/form/ullFlowForm.php

@@ -28 +28 @@
       $this->getWidgetSchema()->offsetSet('duration_seconds', new ullWidgetTimeDurationWrite());
       $this->getValidatorSchema()->offsetSet('duration_seconds', new ullValidatorTimeDuration(array('required' => false)));
+      
+      $this->getWidgetSchema()->offsetSet('effort_date', new ullWidgetDateWrite(array(), array('size' => 10)));
+      $this->getValidatorSchema()->offsetSet('effort_date', new sfValidatorDate(array('required' => false)));
     }    
   }
@@ -43 +46 @@
     $this->setDefaults(array_merge($this->getDefaults(), 
         $this->object->getVirtualValuesAsArray()));
+        
+    if (!$this->getDefault('effort_date'))
+    {
+      $this->setDefault('effort_date', date('Y-m-d')); 
+    }        
   }
   

trunk/plugins/ullFlowPlugin/modules/ullFlow/lib/BaseUllFlowActions.class.php

@@ -173 +173 @@
         )));
         
-        $this->saveEffortDuration();
+        $this->saveEffort();
 
         if (!$this->isStatusOnlyRequestAction())
@@ -930 +930 @@
    * @return none
    */
-  protected function saveEffortDuration()
+  protected function saveEffort()
   {
     $memory = $this->doc->findLatestMemory();
     $projectId = $this->doc->ull_project_id;
     $duration = $this->generator->getForm()->getValue('duration_seconds');
+    $date = $this->generator->getForm()->getValue('effort_date');
     
     if ($duration && $projectId)
@@ -941 +942 @@
       $reporting->ull_project_id = $projectId;
       $reporting->ull_user_id = sfContext::getInstance()->getUser()->getAttribute('user_id');
-      $reporting->date = date('Y-m-d');
+      $reporting->date = $date;
       $reporting->duration_seconds = $duration;
       $reporting->linked_model = 'UllFlowMemory';

trunk/plugins/ullFlowPlugin/modules/ullFlow/templates/editSuccess.php

@@ -54 +54 @@
             <?php echo $generator->getForm()->offsetGet('duration_seconds')->renderError() ?>
             <dfn><?php echo __('Hours : minutes', null, 'ullFlowMessages') ?></dfn>
+            &nbsp; <?php echo __('am', null, 'common') ?>
+            <?php echo $generator->getForm()->offsetGet('effort_date')->render() ?>
+            <?php echo $generator->getForm()->offsetGet('effort_date')->renderError() ?>            
+            
           </p>        
         <?php endif ?>