WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-07-29 11:40:42 -04:00
parent c042097dd1
commit ab4f9dc58d
5 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Dash.php
+2 -2
View File
@@ -79,7 +79,7 @@ class Dash extends Users_Controller {
//======================= move it //======================= move it
/* Table Slider Data */ /* Table Slider Data */
$jbx = "''/proj/thisjob''"; /* $jbx = "''/proj/thisjob''";
$mysql = "SELECT '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project," $mysql = "SELECT '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description," . " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,"
. " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' " . " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
@@ -99,7 +99,7 @@ class Dash extends Users_Controller {
$data['job_table'] = $this->table->generate($query); $data['job_table'] = $this->table->generate($query);
$data['job_table_result'] = $query->result(); // used in new impl. $data['job_table_result'] = $query->result(); // used in new impl.
*/
$x = $this->dashTaskMessage(); $x = $this->dashTaskMessage();
$data['job_message_table'] = $x['job_message_table']; $data['job_message_table'] = $x['job_message_table'];
$data['job_message_table_result'] = $x['job_message_table_result']; $data['job_message_table_result'] = $x['job_message_table_result'];
www/application/controllers/Proj.php
+28 -5
View File
@@ -149,8 +149,17 @@ class Proj extends Users_Controller {
$jbx = "''/proj/thisjob''"; $jbx = "''/proj/thisjob''";
$mysql = "SELECT '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,"
. " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
. " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
. " WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' "
. " ELSE '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"View\">' END) AS manage "
. " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id "
. " WHERE mc.member_id = " . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now() "
. " OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now()";
$mysql = "SELECT '<b>Project ID:</b>'||mc.contract||'<br><b>Title:</b>'||mc.title AS Project,m.firstname||' '||m.lastname AS Client," $mysqlDEL = "SELECT '<b>Project ID:</b>'||mc.contract||'<br><b>Title:</b>'||mc.title AS Project,m.firstname||' '||m.lastname AS Client,"
. " '<b>Timeline:</b> '||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 ,mc.description," . " '<b>Timeline:</b> '||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 ,mc.description,"
. " '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info\" value=\"Manage\">' AS manage," . " '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info\" value=\"Manage\">' AS manage,"
. " (CASE WHEN mc.status = 1 AND mc.delivery_date > now() THEN 'Active' WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' " . " (CASE WHEN mc.status = 1 AND mc.delivery_date > now() THEN 'Active' WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' "
@@ -169,7 +178,7 @@ class Proj extends Users_Controller {
$page = is_numeric($page) ? $page : 0; $page = is_numeric($page) ? $page : 0;
$mysql = "SELECT '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project," $mysqlDEL = "SELECT '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description," . " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,"
. " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' " . " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
. " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' " . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
@@ -177,6 +186,15 @@ class Proj extends Users_Controller {
. "ELSE '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"View\">' END) AS manage " . "ELSE '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"View\">' END) AS manage "
. " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id WHERE mc.member_id = " . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) LIMIT " . $config["per_page"] . " OFFSET " . $page; . " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id WHERE mc.member_id = " . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) LIMIT " . $config["per_page"] . " OFFSET " . $page;
$mysql = "SELECT '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,"
. " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
. " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
. " WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' "
. " ELSE '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"View\">' END) AS manage "
. " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id "
. " WHERE mc.member_id = " . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now() "
. " OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now() LIMIT ". $config["per_page"] . " OFFSET " . $page;;
$query = $this->db->query($mysql); $query = $this->db->query($mysql);
$data['job_table_result'] = $query->result();; $data['job_table_result'] = $query->result();;
@@ -354,7 +372,7 @@ class Proj extends Users_Controller {
redirect(home); redirect(home);
} else { } else {
$message = ""; $message = "";
// echo rand(100,9999). " ameye 1";
$ajax = $this->input->post('ajax'); $ajax = $this->input->post('ajax');
$jobID = $this->input->post('jobID'); $jobID = $this->input->post('jobID');
@@ -365,8 +383,10 @@ class Proj extends Users_Controller {
//$data['mybalance'] = $mybalance; //$data['mybalance'] = $mybalance;
$this->load->model('backend_model'); $this->load->model('backend_model');
// echo rand(100,9999). " ameye 2";
if ($_POST && !isset($_POST['uploadForm'])) { if ($_POST && !isset($_POST['uploadForm'])) {
// echo rand(100,9999). " ameye 2222-2222";
// exit;
$msgArray = array(); $msgArray = array();
$msgArray['message'] = trim($this->input->post('jobmessage')); $msgArray['message'] = trim($this->input->post('jobmessage'));
$msgArray['contract'] = $this->input->post('contractId'); $msgArray['contract'] = $this->input->post('contractId');
@@ -381,6 +401,8 @@ class Proj extends Users_Controller {
$res = $this->backend_model->wrenchboard_api($msgArray, $out); $res = $this->backend_model->wrenchboard_api($msgArray, $out);
} }
} else if ($_POST && isset($_POST['uploadForm']) && isset($_FILES["fileToUpload"])) { } else if ($_POST && isset($_POST['uploadForm']) && isset($_FILES["fileToUpload"])) {
// echo rand(100,9999). " ameye 3333-3333";
// exit;
$message = $this->process_files($_FILES["fileToUpload"]); $message = $this->process_files($_FILES["fileToUpload"]);
} }
@@ -426,7 +448,8 @@ class Proj extends Users_Controller {
} }
if ($ajax == 1) { if ($ajax == 1) {
echo $res; echo isset($res)? $res:'';
$this->RenderUserPage('jobs/view_thisjob', $data);
} else { } else {
/* $this->load->view('users/view_header_user', $data); /* $this->load->view('users/view_header_user', $data);
$this->load->view('jobs/view_thisjob', $data); $this->load->view('jobs/view_thisjob', $data);
www/application/views/jobs/uploads/upload_files.php
+29 -27
View File
@@ -1,30 +1,24 @@
<!--begin::Card toolbar-->
<div class="card-toolbar"> <div class="card-toolbar">
<!--begin::Toolbar--> <!--begin::Toolbar-->
<div class="d-flex justify-content-start" data-kt-filemanager-table-toolbar="base"> <div class="d-flex justify-content-start" data-kt-filemanager-table-toolbar="base">
<button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#kt_modal_upload"> <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#kt_modal_upload">
<!--begin::Svg Icon | path: icons/duotune/files/fil018.svg--> <span class="svg-icon svg-icon-2">
<span class="svg-icon svg-icon-2"> <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"> <path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="black" />
<path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="black" /> <path d="M10.4 3.60001L12 6H21C21.6 6 22 6.4 22 7V19C22 19.6 21.6 20 21 20H3C2.4 20 2 19.6 2 19V4C2 3.4 2.4 3 3 3H9.20001C9.70001 3 10.2 3.20001 10.4 3.60001ZM16 11.6L12.7 8.29999C12.3 7.89999 11.7 7.89999 11.3 8.29999L8 11.6H11V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H16Z" fill="black" />
<path d="M10.4 3.60001L12 6H21C21.6 6 22 6.4 22 7V19C22 19.6 21.6 20 21 20H3C2.4 20 2 19.6 2 19V4C2 3.4 2.4 3 3 3H9.20001C9.70001 3 10.2 3.20001 10.4 3.60001ZM16 11.6L12.7 8.29999C12.3 7.89999 11.7 7.89999 11.3 8.29999L8 11.6H11V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H16Z" fill="black" /> <path opacity="0.3" d="M11 11.6V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H11Z" fill="black" />
<path opacity="0.3" d="M11 11.6V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H11Z" fill="black" /> </svg>
</svg> </span>Upload Files
</span> </button>
<!--end::Svg Icon-->Upload Files</button>
<!--end::Add customer-->
</div> </div>
<!--end::Toolbar--> <div class="d-flex justify-content-end align-items-center d-none" data-kt-filemanager-table-toolbar="selected">
<!--begin::Group actions--> <div class="fw-bolder me-5">
<div class="d-flex justify-content-end align-items-center d-none" data-kt-filemanager-table-toolbar="selected"> <span class="me-2" data-kt-filemanager-table-select="selected_count"></span>Selected</div>
<div class="fw-bolder me-5"> <button type="button" class="btn btn-danger" data-kt-filemanager-table-select="delete_selected">Delete Selected</button>
<span class="me-2" data-kt-filemanager-table-select="selected_count"></span>Selected</div>
<button type="button" class="btn btn-danger" data-kt-filemanager-table-select="delete_selected">Delete Selected</button>
</div>
<!--end::Group actions-->
</div> </div>
<!--end::Card toolbar--> </div>
<!--begin::Modal - Upload File--> <!--begin::Modal - Upload File-->
<div class="modal fade" id="kt_modal_upload" tabindex="-1" aria-hidden="true"> <div class="modal fade" id="kt_modal_upload" tabindex="-1" aria-hidden="true">
@@ -33,7 +27,12 @@
<!--begin::Modal content--> <!--begin::Modal content-->
<div class="modal-content"> <div class="modal-content">
<!--begin::Form--> <!--begin::Form-->
<form class="form" action="none" id="kt_modal_upload_form"> <form action="/proj/thisjob" method='POST' enctype="multipart/form-data">
<input type='hidden' name='uploadForm' value='1'>
<input type='hidden' name='jobID' value='<?php echo $jobID; ?>'>
<input type='hidden' name='contractId' value='<?php echo $contract_id; ?>'>
<!--begin::Modal header--> <!--begin::Modal header-->
<div class="modal-header"> <div class="modal-header">
<!--begin::Modal title--> <!--begin::Modal title-->
@@ -61,9 +60,11 @@
<div class="dropzone dropzone-queue mb-2" id="kt_modal_upload_dropzone"> <div class="dropzone dropzone-queue mb-2" id="kt_modal_upload_dropzone">
<!--begin::Controls--> <!--begin::Controls-->
<div class="dropzone-panel mb-4"> <div class="dropzone-panel mb-4">
<a class="dropzone-select btn btn-sm btn-primary me-2">Attach files</a> <!-- a class="dropzone-select btn btn-sm btn-primary me-2">Attach files</a -->
<a class="dropzone-upload btn btn-sm btn-light-primary me-2">Upload All</a> <input class="dropzone-select btn btn-sm btn-primary me-2" type='file' name='fileToUpload[]' multiple="" id="fileToUpload[]">
<a class="dropzone-remove-all btn btn-sm btn-light-primary">Remove All</a> <!-- a class="dropzone-upload btn btn-sm btn-light-primary me-2">Upload All</a>
<a class="dropzone-remove-all btn btn-sm btn-light-primary">Remove All</a -->
<br><input class="dropzone-select btn btn-sm btn-primary me-2" type='submit' value='Upload' name='upload' />
</div> </div>
<!--end::Controls--> <!--end::Controls-->
<!--begin::Items--> <!--begin::Items-->
@@ -105,7 +106,8 @@
</div> </div>
<!--end::Dropzone--> <!--end::Dropzone-->
<!--begin::Hint--> <!--begin::Hint-->
<span class="form-text fs-6 text-muted">Max file size is 1MB per file.</span> <span class="form-text fs-6 text-muted">There is a file size limit [<?php echo UPLOAD_FILE_SIZE; ?> MB]. Split large files into smaller size</span>
<!--end::Hint--> <!--end::Hint-->
</div> </div>
<!--end::Input group--> <!--end::Input group-->
www/application/views/jobs/view_thisjob.php
+12 -9
View File
@@ -71,9 +71,9 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" data-bs-toggle="tab" href="#kt_tab_pane_1">Send Message</a> <a class="nav-link active" data-bs-toggle="tab" href="#kt_tab_pane_1">Send Message</a>
</li> </li>
<li class="nav-item"> <!-- li class="nav-item">
<a class="nav-link" data-bs-toggle="tab" href="#kt_tab_pane_2">Add File(s)</a> <a class="nav-link" data-bs-toggle="tab" href="#kt_tab_pane_2">Add File(s)</a>
</li> </li -->
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-bs-toggle="tab" href="#kt_tab_pane_3">Actions</a> <a class="nav-link" data-bs-toggle="tab" href="#kt_tab_pane_3">Actions</a>
</li> </li>
@@ -98,13 +98,11 @@
<tbody> <tbody>
<tr> <tr>
<td style="text-align: left;"> <td style="text-align: left;">
<?php
include 'uploads/upload_files.php';
?>
</td> </td>
<td style="width: 30%;"><div id="sendmessagenote"></div></td> <td style="width: 30%;"><div id="sendmessagenote"></div></td>
<td style="width: 20%; text-align:right;"> <button id='btn_cancel' name='btn_cancel' type="submit" class="btn btn-danger btn-sm" onclick="document.message.ajax.value = '0';">Cancel</button></td> <td style="width: 20%; text-align:right;"> <button id='btn_cancel' name='btn_cancel' type="submit" class="btn btn-danger btn-sm" onclick="document.message.ajax.value = '0';">Clear</button></td>
<td style="width: 20%; text-align:right;"><button id='btm_submit' name='btn_submit' type="submit" class="btn btn-primary btn-sm" onclick="SendMessage();return false;">Send Message</button> </td> <td style="width: 20%; text-align:right;"><button id='btm_submit' name='btn_submit' type="submit" class="btn btn-primary btn-sm" onclick="SendMessage();return false;">Send</button> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -112,8 +110,13 @@
</form> </form>
<?php
include 'uploads/upload_files.php';
?>
</div> </div>
<div class="tab-pane fade" id="kt_tab_pane_2" role="tabpanel"> <!-- div class="tab-pane fade" id="kt_tab_pane_2" role="tabpanel">
<div class="form-group"> <div class="form-group">
<form action="/proj/thisjob" method='POST' enctype="multipart/form-data"> <form action="/proj/thisjob" method='POST' enctype="multipart/form-data">
<input type='hidden' name='uploadForm' value='1'> <input type='hidden' name='uploadForm' value='1'>
@@ -123,7 +126,7 @@
<span class="help-block">There is a file size limit [<?php echo UPLOAD_FILE_SIZE; ?> MB]. Split large files into smaller size</span> <span class="help-block">There is a file size limit [<?php echo UPLOAD_FILE_SIZE; ?> MB]. Split large files into smaller size</span>
</form> </form>
</div> </div>
</div> </div -->
<div class="tab-pane fade" id="kt_tab_pane_3" role="tabpanel"> <div class="tab-pane fade" id="kt_tab_pane_3" role="tabpanel">
www/application/views/site3/internal/template/view_securefooter.php
+1
View File
@@ -64,6 +64,7 @@
<script src="/site3/assets/js/custom/fullcalendar/fullcalendar.bundle.js"></script> <script src="/site3/assets/js/custom/fullcalendar/fullcalendar.bundle.js"></script>
<script src="/site3/assets/js/custom/datatables/datatables.bundle.js"></script> <script src="/site3/assets/js/custom/datatables/datatables.bundle.js"></script>
<script src="/site3/assets/plugins/datatables/datatables.bundle.js"></script>
<script src="/site3/assets/js/custom/files/list.js"></script> <script src="/site3/assets/js/custom/files/list.js"></script>
<script src="/site3/assets/js/custom/calendar/calendar.js"></script> <script src="/site3/assets/js/custom/calendar/calendar.js"></script>
<!--end::Page Custom Javascript--> <!--end::Page Custom Javascript-->