From b6b96579fce1b8efe9f97ce0fe11b6e980c121d9 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 31 Jul 2022 15:20:08 -0400 Subject: [PATCH] fix --- www/application/controllers/Proj.php | 7 +-- .../libraries/Users_Controller.php | 24 ++++++++++ .../compo/recent_jobs/recent_jobs_nojob.php | 17 +++++++ .../compo/recent_jobs/recent_jobs_table.php | 47 +++++++++++++++++++ .../views/jobs/uploads/file_table.php | 16 +------ www/application/views/jobs/view_activejob.php | 36 ++------------ www/application/views/users/view_dash.php | 2 +- 7 files changed, 95 insertions(+), 54 deletions(-) create mode 100644 www/application/views/compo/recent_jobs/recent_jobs_nojob.php create mode 100644 www/application/views/compo/recent_jobs/recent_jobs_table.php diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index d147b137..f1d4c424 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -215,6 +215,8 @@ class Proj extends Users_Controller { $data['new_message'] = $out['new_message']; $data['page_title'] = "Active Task"; + $data['recent_complete'] = $this->jobHistory(4); + $this->RenderUserPage('jobs/view_activejob', $data); } @@ -928,11 +930,6 @@ class Proj extends Users_Controller { $data['current_balance'] = $out['current_balance']; $data['new_message'] = $out['new_message']; - - - // $this->load->view('users/view_header_user', $data); - // $this->load->view('jobs/view_completejob', $data); - // $this->load->view('users/view_footer_user', $data); $this->renderSecurePage('jobs/view_completejob', $data); } } diff --git a/www/application/libraries/Users_Controller.php b/www/application/libraries/Users_Controller.php index 193d5889..83473958 100644 --- a/www/application/libraries/Users_Controller.php +++ b/www/application/libraries/Users_Controller.php @@ -26,6 +26,30 @@ class Users_Controller extends WRB_Controller { $this->data = $this->getSessionArray(); } + public function jobHistory($listLimit = 0){ + if ($listLimit == 0 ){ + $listLimit = 50; + } + $jbx = "''/proj/compltjob''"; + $mysql = "SELECT 'Date:'||mc.created::date||'
Timeline: '||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," + . " " + . " 'Project:'||mc.contract||' by '||m.firstname||'
Title:'||mc.title||'
Description:'||mc.description," + . " '' AS manage , mc.id AS offer_id " + . " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id WHERE mc.status=5 AND mc.member_id = " . $_SESSION['member_id'] . " ORDER BY mc.created DESC LIMIT " . $listLimit ; + + $mysql = "SELECT ''||mc.contract||'
'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," + . " 'Title: '||mc.title||'
Description: '||mc.description AS description,'\/proj\/compltjob' AS qpath, mc.id AS offer_id," + . " (CASE WHEN mc.status=4 THEN '' " + . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '' " + . " WHEN mc.status = 1 AND mc.delivery_date PastDue' " + . " ELSE '' END) AS manage " + . " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id " + . " WHERE mc.client_id = " . $_SESSION['member_id'] . " AND mc.status IN (5) AND mc.delivery_date > now() LIMIT 4"; + + $query = $this->db->query($mysql); + + return $query->result(); + } public function activeProjects(){ diff --git a/www/application/views/compo/recent_jobs/recent_jobs_nojob.php b/www/application/views/compo/recent_jobs/recent_jobs_nojob.php new file mode 100644 index 00000000..cd04e8f2 --- /dev/null +++ b/www/application/views/compo/recent_jobs/recent_jobs_nojob.php @@ -0,0 +1,17 @@ +
+
+
+
+
+
+

You have not completed any task yet

+

The list will show as tasks +
get completed.

+ Browse Jobs +
+ +
+
+
+
+
diff --git a/www/application/views/compo/recent_jobs/recent_jobs_table.php b/www/application/views/compo/recent_jobs/recent_jobs_table.php new file mode 100644 index 00000000..2b5dfb5e --- /dev/null +++ b/www/application/views/compo/recent_jobs/recent_jobs_table.php @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
JobTitle/DescriptionStatus
+ project ?> + description ?> + + + + + + + + + + + + +
\ No newline at end of file diff --git a/www/application/views/jobs/uploads/file_table.php b/www/application/views/jobs/uploads/file_table.php index 1d34b84d..8707d72c 100644 --- a/www/application/views/jobs/uploads/file_table.php +++ b/www/application/views/jobs/uploads/file_table.php @@ -12,35 +12,22 @@ $pieces = explode(".", $row->message); ?>
-
-
- - - +
- -
msg?>
- - -
date1?>
-
-
-
-
@@ -56,6 +43,5 @@
- \ No newline at end of file diff --git a/www/application/views/jobs/view_activejob.php b/www/application/views/jobs/view_activejob.php index c01cf711..5bbc7b7f 100644 --- a/www/application/views/jobs/view_activejob.php +++ b/www/application/views/jobs/view_activejob.php @@ -21,42 +21,12 @@ include(VIEWPATH.'/compo/comp_active_jobs.php'); ?> - -
- -
- -
- -
- - -
-
- -
- -
- - - -
- -
- - -
-
- -
- +
- - - -