Atualização referente à tarefa #4

hebertom · hebertom · commit d730db0f04e3 · 2016-06-05T12:35:53.000-03:00
diff --git a/agana/agana/modules/assistance/controllers/ActivityController.php b/agana/agana/modules/assistance/controllers/ActivityController.php
@@ -26,7 +26,67 @@ protected function _isUserAllowed($resource, $privilege) {
 
     public function createAction() {
 
-        parent::createAction();
+        //parent::createAction();
+
+
+        try {
+
+            if ($this->_isUserAllowed(null, null)) {
+
+                $f = $this->getFormCRUName();
+                $form = new $f($f::ACTION_ADD);
+
+                $request = $this->getRequest();
+
+                if ($request->isPost()) {
+
+                    $data = $request->getPost();
+
+                    $form->populate($data);
+                    if ($form->save->isChecked()) {
+                        if ($form->isValid($data)) {
+                            try {
+
+//                                var_dump($form->getValues());
+//                                die();
+                                foreach ($data['task_type_id'] as $tarefa) {
+                                    $dadosInsercao = array();
+                                    foreach ($form->getValues() as $key => $value) {
+                                        if ($key == 'task_type_id') {
+                                            $dadosInsercao[$key] = $tarefa;
+                                        } else {
+                                            $dadosInsercao[$key] = $value;
+                                        }
+                                    }
+
+                                    $id = $this->_createRecord($dadosInsercao);
+
+                                    $urlRedirect = $this->getUrlRedirectionCreateSuccess();
+
+                                    if ($this->_useIdCreatedOnUrl && $id) {
+                                        $urlRedirect['id'] = $id;
+                                    }
+                                }
+
+                                $this->_formSuccess($urlRedirect);
+                            } catch (Exception $e) {
+                                $this->_addSavingExceptionMessage($e);
+                            }
+                        } else {
+                            $this->_addFormValidationMessage();
+                        }
+                    } else {
+                        if ($form->cancel->isChecked()) {
+                            $urlRedirect = $this->getUrlRedirectionCreateCancel();
+                            $this->_formCancel($urlRedirect);
+                        }
+                    }
+                }
+                $this->view->form = $form;
+            }
+        } catch (Exception $e) {
+            $this->_addExceptionMessage($e);
+        }
 
         // preenche os campos com os dados da pessoa de usuário que 
         // está usando o sistema
@@ -40,6 +100,7 @@ public function createAction() {
         $this->view->person_helped = new Persons_Model_Person();
 
         if ($this->getRequest()->isPost()) {
+
             $phId = $this->getRequest()->getParam('person_helped_id', 0);
             if ($phId > 0) {
                 $person = $personDomain->getById($phId);
@@ -90,21 +151,17 @@ public function listByPersonHelpedAction() {
     }
 
     public function reportByProjectAction() {
-        $meta = new Agana_Print_Meta('Atendimentos por projeto', 'Sistema Comercial', 
-                    'ONG ONLINE', 'http://www.ongonline.com.br');
+        $meta = new Agana_Print_Meta('Atendimentos por projeto', 'Sistema Comercial', 'ONG ONLINE', 'http://www.ongonline.com.br');
+
+        $renderViews['form'] = 'report-by-project-form';
+        $renderViews['report'] = 'report-by-project-report';
+        $renderViews['summarized'] = 'report-by-project-report-summarized';
 
-        $renderViews['form']        = 'report-by-project-form';
-        $renderViews['report']      = 'report-by-project-report';
-        $renderViews['summarized']  = 'report-by-project-report-summarized';
-        
 //        Zend_Debug::dump($this->getRequest());
 //        die();
-        
+
         $report = new Agana_Print_Report();
-        return $report->handleRequest('Assistance_Domain_Activity', 'getActivitiesByProject', 
-                'Assistance_Form_ActivityReportByProject',
-                $renderViews, 
-                'activity', $meta, $this);
+        return $report->handleRequest('Assistance_Domain_Activity', 'getActivitiesByProject', 'Assistance_Form_ActivityReportByProject', $renderViews, 'activity', $meta, $this);
     }
 
 }
diff --git a/agana/agana/modules/assistance/controllers/EventController.php b/agana/agana/modules/assistance/controllers/EventController.php
@@ -69,6 +69,10 @@ public function createActivityAction() {
 
                 if ($request->isPost()) {
                     $data = $request->getPost();
+                    
+                    var_dump($request);
+                    die();
+                    
                     $form->populate($data);
                     if ($form->save->isChecked()) {
                         if ($form->isValid($data)) {
diff --git a/agana/agana/modules/assistance/domain/Event.php b/agana/agana/modules/assistance/domain/Event.php
@@ -63,6 +63,10 @@ public function populate($data) {
     }
 
     public function create() {
+
+        Zend_Debug::dump("É assahdiu?");
+        die();
+
         if ($this->_isAllowed()) {
             try {
                 $u = new Assistance_Persist_Dao_Event();
diff --git a/agana/agana/modules/assistance/forms/Activity.php b/agana/agana/modules/assistance/forms/Activity.php
@@ -98,18 +98,20 @@ private function _addProjectId() {
     }
 
     private function _addTaskId() {
-        $this->addElement('select', 'task_type_id', array(
+
+        $this->addElement('MultiCheckbox', 'task_type_id', array(
             'required' => true,
             'label' => 'Tipo de tarefa',
-            'dimension' => 6,
+            'dimension' => 6
         ));
 
         $el = $this->getElement('task_type_id');
 
         $taskDomain = new Project_Domain_Tasktype();
         $task = $taskDomain->getAllChildrenTask();
+      
         
-        $el->addMultiOption(null, null);
+//        $el->addMultiOption(null, null);
         foreach ($task as $tsk) {
             $tskName = '';
             if (trim($tsk->getParent_id()) != '') {
diff --git a/agana/agana/modules/assistance/persist/dao/Activity.php b/agana/agana/modules/assistance/persist/dao/Activity.php
@@ -39,8 +39,9 @@ class Assistance_Persist_Dao_Activity extends Agana_Persist_Dao_Abstract impleme
     protected function _prepareInsertData($data) {
         $dataPrepared = $this->_prepareUpdateData($data);
 
+
         $dataPrepared['appaccount_id'] = $data->getAppaccount_id();
-        
+
         return $dataPrepared;
     }
 
@@ -51,6 +52,7 @@ protected function _prepareInsertData($data) {
      * @return Array 
      */
     protected function _prepareUpdateData($data) {
+
         $data = array(
             'assistance_time' => $data->getAssistance_time(),
             'assistance_date' => Agana_Util_DateTime::dateToYYMMDD($data->getAssistance_date()),
@@ -64,9 +66,9 @@ protected function _prepareUpdateData($data) {
             'id_by_finger_key' => $data->getId_by_finger_key(),
                 //'birthdate' => ($data->getBirthdate()) ? Agana_Util_DateTime::dateToYYMMDD($data->getBirthdate()) : null,
         );
-        
+
         unset($data['appaccount_id']);
-        
+
         return $data;
     }
 
@@ -86,16 +88,14 @@ protected function _prepareReturnData($data, $returnArray = true) {
     public function getAllByPersonHelped($id, $appaccount_id, $orderby) {
         $db = $this->getDefaultAdapter();
 
-        $sql = $db->select()                
+        $sql = $db->select()
                 ->from(array('at' => 'atividade_assistencia'))
-                
-                ->join(array('ph'=>'person'),
-                        'at.person_helped_id = ph.id')
+                ->join(array('ph' => 'person'), 'at.person_helped_id = ph.id')
                 ->order($orderby);
 
         $sql->where('person_helped_id = ?', $id);
         $sql->where('ph.appaccount_id = ?', $appaccount_id);
-        
+
         $db->setFetchMode(Zend_DB::FETCH_ASSOC);
 
         $r = $db->fetchAll($sql);
@@ -115,13 +115,13 @@ public function getActivitiesByProject($appaccount_id, $params = null) {
         $db = $this->getDefaultAdapter();
 
         $sql = $db->select()
-                ->from(array('proj' => 'project'), array('project_id' => 'id','project_name' => 'name',                    
+                ->from(array('proj' => 'project'), array('project_id' => 'id', 'project_name' => 'name',
                     'project_status' => 'status'))
                 ->join(array('act' => 'atividade_assistencia'), 'act.project_id = proj.id', array('assistance_id' => 'id', 'assistance_date', 'assistance_time', 'id_by_finger_key'))
                 ->join(array('task' => 'task_type'), 'act.task_type_id = task.id', array('task_id' => 'id', 'task_name' => 'name'))
                 ->join(array('p' => 'person'), 'act.person_helped_id = p.id', array('person_id' => 'id', 'person_name' => 'name'))
                 ->joinLeft(array('task_parent' => 'task_type'), 'task.parent_id = task_parent.id', array('task_parent_id' => 'id', 'task_parent_name' => 'name'))
-                ->order(array('proj.name', 'task_parent.name', 'task.name', 'act.assistance_date','p.name'));
+                ->order(array('proj.name', 'task_parent.name', 'task.name', 'act.assistance_date', 'p.name'));
 
         $sql->where('proj.appaccount_id = ?', $appaccount_id);
 
@@ -162,4 +162,4 @@ public function getActivitiesByProject($appaccount_id, $params = null) {
         return $r;
     }
 
-   }
+}
diff --git a/agana/agana/modules/assistance/persist/dao/Event.php b/agana/agana/modules/assistance/persist/dao/Event.php
@@ -51,6 +51,7 @@ protected function _prepareInsertData($data) {
      * @return Array 
      */
     protected function _prepareUpdateData($data) {
+        
         $data = array(
             'event_date' => Agana_Util_DateTime::dateToYYMMDD($data->getEvent_date()),
             'task_type_id' => $data->getTask_type_id(),
diff --git a/agana/agana/modules/assistance/views/scripts/activity/create.phtml b/agana/agana/modules/assistance/views/scripts/activity/create.phtml
@@ -3,6 +3,7 @@ $title = 'Atendimento de assistência';
 $this->title = $title . ' - ' . $this->translate("Add new");
 $this->headTitle($title);
 $this->form->setAction($this->url());
+
 $form = $this->form;
 
 $urlSearchForm = $this->url(array(
@@ -22,6 +23,8 @@ $urlPersonDetails = $this->url(array(
     <div class="window-header">
         <h3><i class="icon-food"></i> <?php echo $this->title; ?></h3>
     </div>
+
+
     <form id="person" 
           class=" form-horizontal well" 
           action="<?= $this->form->getAction() ?>" 
@@ -134,7 +137,7 @@ $urlPersonDetails = $this->url(array(
             <span class="span4">
                 <?= $form->getElement('assistance_date')->render() ?>
             </span>
-            <span class="span4 ">
+            <span class="span4">
                 <?= $form->getElement('assistance_time')->render() ?>
             </span>
         </div>
@@ -162,21 +165,20 @@ $urlPersonDetails = $this->url(array(
 </div>
 
 <script>
-    <?php
-        $urlImgPersonHelped = $this->url(array(
-                'module' => 'persons',
-                'controller' => 'person',
-                'action' => 'image-url'
-            ), null, true);
-
-    ?>
-    $('#windowCreateActivityAssistance').on('atualizarImagemAssistido', null, function(ev) {
+<?php
+$urlImgPersonHelped = $this->url(array(
+    'module' => 'persons',
+    'controller' => 'person',
+    'action' => 'image-url'
+        ), null, true);
+?>
+    $('#windowCreateActivityAssistance').on('atualizarImagemAssistido', null, function (ev) {
         console.log('Chamou atualizar imagem');
         var urlImgSrc = '<?= $urlImgPersonHelped ?>/id/' + $('#person_helped_id').val();
         console.log('img src = ' + urlImgSrc);
         $.ajax({
             url: urlImgSrc
-        }).done(function(imgUrl) {
+        }).done(function (imgUrl) {
             console.log(imgUrl);
             $('#imgPersonHelped').attr({src: imgUrl});
         });
diff --git a/agana/lib/Agana/Controller/Crud/Action.php b/agana/lib/Agana/Controller/Crud/Action.php
diff --git a/app/themes/ongonline/vendor/agana/angular/assistanceModule.js b/app/themes/ongonline/vendor/agana/angular/assistanceModule.js
diff --git a/configs/agana_ongonline.ini b/configs/agana_ongonline.ini
