diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 4fd03549..77056675 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -405,7 +405,7 @@ class Proj extends Users_Controller { } $data = $this->load_files($data, $jobID); - $this->load_files($data, $jobID); + //$this->load_files($data, $jobID); $this->load->model('dash_model'); $out = $this->dash_model->getDashData($data); @@ -681,22 +681,22 @@ $data = $this->getSessionArray(); $data['this_job'] = $jbD->this_job; $data['contract_id'] = $jbD->contract_id; $data['job_detail'] = $jbD->job_detail; + /* + $sqlMsg = "SELECT (CASE WHEN jc.msg_type='FILE' THEN ''||jc.message||'' ELSE '['||m.firstname||']->'||jc.created||'
'||jc.message END) AS msg " + . "FROM jobs_contract_message jc " + . "LEFT JOIN members m ON m.id=jc.member_id " + . "WHERE jc.contract='" . $data['contract_id'] . "' ORDER by jcESC"; - $sqlMsg = "SELECT (CASE WHEN jc.msg_type='FILE' THEN ''||jc.message||'' ELSE '['||m.firstname||']->'||jc.created||'
'||jc.message END) AS msg " - . "FROM jobs_contract_message jc " - . "LEFT JOIN members m ON m.id=jc.member_id " - . "WHERE jc.contract='" . $data['contract_id'] . "' ORDER by jc.id DESC"; - - - $file_icon = "\"Icon\""; - - $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, ''||(CASE WHEN jc.msg_type='FILE' THEN 'FILE-' ELSE '' END) ||''||m.firstname AS title,jc.id as msg_id," - . "(CASE WHEN jc.msg_type='FILE' THEN ''||jc.message||'' ELSE jc.message END) AS msg " - . "FROM jobs_contract_message jc " - . "LEFT JOIN members m ON m.id=jc.member_id " - . "WHERE jc.contract='" . $data['contract_id'] . "' ORDER by jc.id DESC"; + /* + $file_icon = "\"Icon\""; + $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, ''||(CASE WHEN jc.msg_type='FILE' THEN 'FILE-' ELSE '' END) ||''||m.firstname AS title,jc.id as msg_id," + . "(CASE WHEN jc.msg_type='FILE' THEN ''||jc.message||'' ELSE jc.message END) AS msg " + . "FROM jobs_contract_message jc " + . "LEFT JOIN members m ON m.id=jc.member_id " + . "WHERE jc.contract='" . $data['contract_id'] . "' ORDER by jc.id DESC"; + */ $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, ''||(CASE WHEN jc.msg_type='FILE' THEN ' - ' ELSE '' END) ||''||m.firstname AS title,jc.id as msg_id," . "(CASE WHEN jc.msg_type='FILE' THEN ''||jc.message||'' ELSE jc.message END) AS msg, " . " jc.msg_type, jc.message " @@ -713,7 +713,18 @@ $data = $this->getSessionArray(); //=================== $data['message_result'] = $query_message->result(); - + + //---------------------------------------------------------------- + /* Neeed to get just the files here - part of the display items */ + $files_only= []; + foreach ($data['message_result'] as $frow){ + if ($frow->msg_type==='FILE'){ + $files_only[]=$frow; + } + } + $data['files_only'] =$files_only; + //----- END OFFILYER FILES ONLY OUT ------------------------------ + // $data['message_result_show'] = $this->messageAccordion($data['message_result']); @@ -1023,7 +1034,9 @@ $data = $this->getSessionArray(); } } - + /* + * This is the file upload function + */ private function process_files($files) { $result = ""; $d_txt = ""; diff --git a/www/application/views/compo/compo_msg4_accord.php b/www/application/views/compo/compo_msg4_accord.php index afefb4ad..ad0e9a21 100644 --- a/www/application/views/compo/compo_msg4_accord.php +++ b/www/application/views/compo/compo_msg4_accord.php @@ -20,7 +20,7 @@ foreach($message_result as $row){
- msg?> + msg?>
diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php index e9ac4167..1076520d 100644 --- a/www/application/views/jobs/view_thisjob.php +++ b/www/application/views/jobs/view_thisjob.php @@ -66,130 +66,130 @@
- + -
-
-
+
+
+
-
- - - + + + + -
- -
+
+ +
-
- - - - - - - - - - -
-
-
-
+
+ + + + + + + + + + +
+
+
+
-
+ - + -
- -
- - -

Use action to manage the status of the project

-
- - - - - - - - - - -
- If you have completed this task and will like the owner to review the work for acceptance, click "Completed" button. - -
-
- If you are unable to complete and will like this project canceled, click "Cancel task" button. - -
-
-
-

Note: Buttons may be disabled for some days at the start of the task

-
+
+ +
- + +

Use action to manage the status of the project

+
+ + + + + + + + + + +
+ If you have completed this task and will like the owner to review the work for acceptance, click "Completed" button. + +
+
+ If you are unable to complete and will like this project canceled, click "Cancel task" button. + +
+
+
+

Note: Buttons may be disabled for some days at the start of the task

+
+ + - - - - - - - - - - -
- Accept or reject the completion of the task below. We will notify the other partner and finalize payment for the task. - -
-
- If you reject the work done or want more review before accepting, click "Reject Completion." - -
-
- -
+ + + + + + + + + + +
+ Accept or reject the completion of the task below. We will notify the other partner and finalize payment for the task. + +
+
+ If you reject the work done or want more review before accepting, click "Reject Completion." + +
+
+ +
-
-
+
+
@@ -197,6 +197,16 @@
+ +
+ + + +
+ +