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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-07-30 12:56:05 -04:00
parent c3ce8490d7
commit 2147171f9e
3 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/views/jobs/jobaction/job_owner.php
+18
View File
@@ -0,0 +1,18 @@
<table class='table table-striped table-hover table-bordered table-condensed'>
<tr>
<td>
Accept or reject the completion of the task below. We will notify the other partner and finalize payment for the task.
</td>
<td style="width:140px;">
<div id="accept_completion"> <button type="submit" id="accept_completion_submit" class="btn btn-primary btn-sm" onclick="return acceptCompletion('<?php echo $job_contract; ?>');" <?php echo $disabled11; ?> >Accept Completion</button></div>
</td>
</tr>
<tr>
<td>
If you reject the work done or want more review before accepting, click "Reject Completion."
</td>
<td style="width:140px;">
<div id="reject_completion"> <button type="submit" id="reject_completion_submit" class="btn btn-danger btn-sm" <?php echo $disabled22; ?> onclick="return rejectCompletion('<?php echo $job_contract; ?>');" >Reject Completion</button></div>
</td>
</tr>
</table>
www/application/views/jobs/jobaction/job_worker.php
+21
View File
@@ -0,0 +1,21 @@
<table class='table table-striped table-hover table-bordered table-condensed'>
<tr>
<td>
If you have completed this task and will like the owner to review the work for acceptance, click "Completed" button.
</td>
<td style="width:140px;">
<div id="req_completion"> <button type="submit" id="req_completion_submit" class="btn btn-primary btn-sm" onclick="return requestCompletion('<?php echo $job_contract; ?>');" <?php echo $disabled1; ?> >Completed</button></div>
</td>
</tr>
<tr>
<td>
If you are unable to complete and will like this project canceled, click "Cancel task" button.
</td>
<td style="width:140px;">
<div id="req_cancel"> <button type="submit" id="req_cancel_submit" onclick="return requestCancel('<?php echo $job_contract; ?>');" class="btn btn-danger btn-sm" <?php echo $disabled2; ?> >Request Cancel</button> </div>
</td>
</tr>
</table>
<div style="font-size: large; font-family: sans-serif">
<p style="color: #ff0000; background-color: #ffffff">Note: Buttons may be disabled for some days at the start of the task</p>
</div>
www/application/views/jobs/view_thisjob.php
+33 -3
View File
@@ -200,10 +200,10 @@
</div>
</div>
<div class="col-xl-4">
<div class="card card-xl-stretch mb-5 mb-xl-8">
<div class="card mb-5 mb-xl-8">
<div class="card-header border-0 pt-5">
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1">Messages</span>
<span class="card-label fw-bolder fs-3 mb-1">Actions</span>
</h3>
<div class="card-toolbar">
@@ -213,14 +213,44 @@
<div class="tab-content">
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<div class="table-responsive">
<?php
include(VIEWPATH.'/compo/compo_msg4_accord.php');
if ($this_is_client == true) {
// include(VIEWPATH.'/compo/compo_msg4_accord.php');
include('jobaction/job_worker.php');
}
if ($this_is_project_owner == true) {
include('jobaction/job_owner.php');
}
?>
</div>
</div>
</div>
</div>
</div>
<div class="card card-xl-stretch mb-5 mb-xl-8">
<div class="card-header border-0 pt-5">
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1">Messages</span>
</h3>
<div class="card-toolbar">
</div>
</div>
<div class="card-body py-3">
<div class="tab-content">
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<div class="table-responsive">
<?php
include(VIEWPATH.'/compo/compo_msg4_accord.php');
?>
</div>
</div>
</div>
</div>
</div>
</div>
</div>