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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-02-18 15:52:41 -05:00
parent 65e7601bda
commit 83a246ee6e
6 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Jobs.php
+15 -15
View File
@@ -610,9 +610,9 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] )
if ($num > 0) {
$row = $query->row_array();
$myTable = "<table class='table table-sm table-hover table-bordered table-condensed' style=' background-color: #ebf1e8;'>";
$myTable = " <div class='card card-xl-stretch mb-5 mb-xl-8'>";
$myTable .= $this->makeMarketDetailTableRow($row);
$myTable .="</table>";
$myTable .="</div>";
}
echo $myTable;
@@ -629,19 +629,19 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] )
return "<tr><td colspan='2' ><b>" . $row['offer_code'] . "</b> Timeline:" . $row['timeline_days'] . " day(s) - <b>Budget: </b> " . $row['price'] * 0.01 . " Naira</td></tr>"
. "<tr><td style='width:100px;'><b>Title</b></td><td>" . $row['title'] . "</td></tr>"
. "<tr><td><b>Description</b></td><td>" . $row['description'] . "</td></tr>"
. "<tr><td><b>Detail</b></td><td>" . $row['job_description'] . "</td></tr>"
. "<tr><td colspan='2' >Interests : <b>" . $data['interest'] . "</b> Expire:<b> " . $row['expire']."</b> </td></tr>"
. "<tr><td><b></b></td><td style='text-align:right;'><input type=submit id='submit_interest_" . $row['offer_code'] . "' name=\"mview\" onclick=\"return SInterest('" . $row['offer_code'] . "');\" class=\"btn btn-success btn-xs\" value=\"Send Interest Request
\"></td></tr>"
. "<tr><td colspan='2'>If you have any questions about this task :"
. "<div id='msg_result_" . $row['offer_code'] . "'><form name=\"job_message\"><table class='table table-striped table-hover table-bordered table-condensed'>"
. "<tr><td><textarea name='yourmessage' cols=\"5\" rows=\"3\" class=\"textarea form-control\" class=\"btn btn-success btn-xs\" placeholder=\"Enter message here ...\"></textarea></td></tr>"
. "<tr><td style='text-align:right;'><button id='submit_yourmessage_" . $row['offer_code'] . "' onclick=\"return OMessage('" . $row['offer_code'] . "');\" class=\"btn btn-info btn-xs\">Send Message</button></td></tr></table></form></div>"
. "</td></tr>"
. " ";
return "<div class='card-body'><table class='table table-sm table-hover table-bordered table-condensed' style='background-color: #ffffff;'><tr><td colspan='2' ><b>" . $row['offer_code'] . "</b> Timeline:" . $row['timeline_days'] . " day(s) - <b>Budget: </b> " . $row['price'] * 0.01 . " Naira</td></tr>"
. "<tr><td style='width:100px;'><b>Title</b></td><td>" . $row['title'] . "</td></tr>"
. "<tr><td><b>Description</b></td><td>" . $row['description'] . "</td></tr>"
. "<tr><td><b>Detail</b></td><td>" . $row['job_description'] . "</td></tr>"
. "<tr><td colspan='2' >Interests : <b>" . $data['interest'] . "</b> Expire:<b> " . $row['expire']."</b> </td></tr>"
. "<tr><td><b></b></td><td style='text-align:right;'><input type=submit id='submit_interest_" . $row['offer_code'] . "' name=\"mview\" onclick=\"return SInterest('" . $row['offer_code'] . "');\" class=\"btn btn-success btn-xs\" value=\"Send Interest Request
\"></td></tr>"
. "<tr><td colspan='2'>If you have any questions about this task :"
. "<div id='msg_result_" . $row['offer_code'] . "'><form name=\"job_message\"><table class='table table-striped table-hover table-bordered table-condensed'>"
. "<tr><td><textarea name='yourmessage' cols=\"5\" rows=\"3\" class=\"textarea form-control\" class=\"btn btn-success btn-xs\" placeholder=\"Enter message here ...\"></textarea></td></tr>"
. "<tr><td style='text-align:right;'><button id='submit_yourmessage_" . $row['offer_code'] . "' onclick=\"return OMessage('" . $row['offer_code'] . "');\" class=\"btn btn-info btn-xs\">Send Message</button></td></tr></table></form></div>"
. "</td></tr>"
. " </table></div>";
}
public function viewmyjob() {
www/application/controllers/Member.php
+1 -1
View File
@@ -681,7 +681,7 @@ class Member extends Users_Controller {
$query = $this->db->query($mysql);
$this->table->set_heading('Date', 'Amount','Fee','Recipient','Confirmation', 'Status');
$data['sendmoney_table'] = $this->table->generate($query);
$data['page_title'] ="Wallet";
$this->RenderUserPage('users/view_balance', $data);
}
www/application/controllers/Proj.php
+6 -2
View File
@@ -232,9 +232,13 @@ 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('users/view_header_user', $data);
$this->load->view('jobs/view_activejob', $data);
$this->load->view('users/view_footer_user', $data);
$this->load->view('users/view_footer_user', $data);*/
$data['page_title'] = "Active Task";
$this->RenderUserPage('jobs/view_activejob', $data);
}
}
www/application/views/jobs/view_activejob.php
+49 -25
View File
@@ -12,28 +12,53 @@
return false;
}
// -->
</script>
<div class="content-wrapper">
<!-- Quick stats boxes -->
<?php include('common/jobstrip.php');?>
<!-- /quick stats boxes -->
<!-- Marketing campaigns -->
<div class="panel panel-flat">
<div class="panel-heading" style="height: 550px;">
<div class="table-responsive">
<h5 class="panel-title">Active Task</h5>
<?php echo $job_table ?>
</div>
<div class="panel-heading">
<?php echo $links; ?>
</div>
</div>
</div>
<!-- /marketing campaigns -->
</script>
<!-- Quick stats boxes -->
<?php include('common/jobstrip.php');?>
<!-- /quick stats boxes -->
<!--begin::Row-->
<div class="row g-5 g-xl-8">
<div class="col-xl-12">
<!--begin::Charts Widget 1-->
<div class="card card-xl-stretch mb-5 mb-xl-8">
<!--begin::Header-->
<div class="card-header border-0 pt-5">
<!--begin::Title-->
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1">Active Task</span>
</h3>
<!--end::Title-->
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body">
<div class="tab-content">
<!--begin::Tap pane-->
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<!--begin::Table container-->
<div class="table-responsive">
<!--begin::Table-->
<?php echo $job_table ?>
</div>
<!--end::Table-->
<?php echo $links; ?>
</div>
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>
<!--end::Charts Widget 1-->
</div>
</div>
<!-- /main content -->
<!--end::Row-->
@@ -85,11 +110,12 @@ function showJobModal(contact_id) {
var post_data = {
'interest_id': id,
};
//alert(contact_id);
$.ajax({
url: "/jobs/jobdetail_modal?contact_id="+contact_id
}).done(function (data) {
//alert(data);
// alert(data);
$('#modal-content').html(data);
});
}
@@ -100,12 +126,10 @@ function showJobModal(contact_id) {
<!-- Basic modal -->
<div id="modal_theme_primary" class="modal fade">
<div class="modal-dialog">
<div class="modal-dialog mw-650px">
<div class="modal-content" id="modal-content">
</div>
</div>
</div>
<!-- /basic modal -->
<!-- /basic modal -->
www/application/views/jobs/view_market.php
+1 -1
View File
@@ -144,7 +144,7 @@
<!-- Basic modal -->
<div id="modal_theme_primary" class="modal fade">
<div class="modal-dialog">
<div class="modal-dialog mw-650px">
<div class="modal-content" id="modal-content">
</div>
www/application/views/users/view_balance.php
-6
View File
@@ -43,10 +43,8 @@
</div>
<!--end::Row-->
<!--begin::Row-->
<div class="row g-5 g-xl-8">
<div class="col-xl-12">
<!--begin::Charts Widget 1-->
<div class="card card-xl-stretch mb-5 mb-xl-8">
<!--begin::Header-->
<div class="card-header border-0 pt-5">
@@ -58,7 +56,6 @@
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body">
<div class="tab-content">
<!--begin::Tap pane-->
@@ -149,12 +146,9 @@
</div>
<!--end::Body-->
</div>
<!--end::Charts Widget 1-->
</div>
</div>
<!--end::Row-->
<!--begin::Row-->
<div class="row g-5 g-xl-8">