fix
This commit is contained in:
@@ -1021,14 +1021,14 @@ class Member extends Users_Controller {
|
||||
ORDER BY mm.id DESC LIMIT 20";
|
||||
|
||||
|
||||
$mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo
|
||||
$mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo,mm.reply
|
||||
FROM members_messages mm
|
||||
LEFT JOIN members ms ON mm.senders_id = ms.id
|
||||
WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL
|
||||
WHERE mm.member_id = " . $_SESSION['member_id'] . "
|
||||
UNION
|
||||
SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo
|
||||
SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo, mm.reply
|
||||
FROM members_messages mm
|
||||
WHERE mm.senders_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL
|
||||
WHERE mm.senders_id = " . $_SESSION['member_id'] . "
|
||||
ORDER BY msg_date DESC LIMIT 30";
|
||||
|
||||
$query = $this->db->query($mysql);
|
||||
@@ -1052,11 +1052,26 @@ class Member extends Users_Controller {
|
||||
}
|
||||
|
||||
public function setupReply(){
|
||||
//E&message_id=" + message_id +"&job_id="+job_id
|
||||
$message_id = trim($this->input->get('message_id'));
|
||||
$job_id = trim($this->input->get('job_id'));
|
||||
if ($message_id > 0 && $job_id !=''){
|
||||
$answer_string = $this->load->view('users/sections/mgs_reply', '', TRUE);
|
||||
$data['job_id'] = $job_id;
|
||||
$data['message_id'] = $message_id;
|
||||
|
||||
$mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo
|
||||
FROM members_messages mm
|
||||
LEFT JOIN members ms ON mm.senders_id = ms.id
|
||||
WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.memo='".$job_id."'
|
||||
UNION
|
||||
SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo
|
||||
FROM members_messages mm
|
||||
WHERE mm.senders_id = " . $_SESSION['member_id'] . " AND mm.memo='".$job_id."'
|
||||
ORDER BY msg_date DESC LIMIT 30";
|
||||
|
||||
$query = $this->db->query($mysql);
|
||||
$data['my_message_rows'] = $query->result_array(); // new implementation
|
||||
|
||||
$answer_string = $this->load->view('users/sections/mgs_reply', $data, TRUE);
|
||||
echo $answer_string;
|
||||
}
|
||||
}
|
||||
@@ -1110,6 +1125,7 @@ class Member extends Users_Controller {
|
||||
$in["message_id"] = $this->input->get('message_id');
|
||||
$in["memo"] = trim($this->input->get('message_code'));
|
||||
$in["yourmessage"] = trim($this->input->get('yourmessage'));
|
||||
$in['member_id'] = $_SESSION['member_id'];
|
||||
|
||||
if ($in["message_id"] > 0 && $in["memo"] != '' && $in["yourmessage"] != '') {
|
||||
$in['action'] = WRENCHBOARD_JOB_REPLY_QUESTION;
|
||||
|
||||
@@ -191,30 +191,31 @@
|
||||
<?php
|
||||
if (isset($_SESSION["post_jobs"]) && $_SESSION["post_jobs"] != '') {
|
||||
?>
|
||||
|
||||
|
||||
<a href="/jobs/manage">
|
||||
<div class="menu-item">
|
||||
<span class="menu-link">
|
||||
<span class="menu-icon">
|
||||
<!--begin::Svg Icon | path: icons/duotune/general/gen002.svg-->
|
||||
<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">
|
||||
<path opacity="0.3" d="M4.05424 15.1982C8.34524 7.76818 13.5782 3.26318 20.9282 2.01418C21.0729 1.98837 21.2216 1.99789 21.3618 2.04193C21.502 2.08597 21.6294 2.16323 21.7333 2.26712C21.8372 2.37101 21.9144 2.49846 21.9585 2.63863C22.0025 2.7788 22.012 2.92754 21.9862 3.07218C20.7372 10.4222 16.2322 15.6552 8.80224 19.9462L4.05424 15.1982ZM3.81924 17.3372L2.63324 20.4482C2.58427 20.5765 2.5735 20.7163 2.6022 20.8507C2.63091 20.9851 2.69788 21.1082 2.79503 21.2054C2.89218 21.3025 3.01536 21.3695 3.14972 21.3982C3.28408 21.4269 3.42387 21.4161 3.55224 21.3672L6.66524 20.1802L3.81924 17.3372ZM16.5002 5.99818C16.2036 5.99818 15.9136 6.08615 15.6669 6.25097C15.4202 6.41579 15.228 6.65006 15.1144 6.92415C15.0009 7.19824 14.9712 7.49984 15.0291 7.79081C15.0869 8.08178 15.2298 8.34906 15.4396 8.55884C15.6494 8.76862 15.9166 8.91148 16.2076 8.96935C16.4986 9.02723 16.8002 8.99753 17.0743 8.884C17.3484 8.77046 17.5826 8.5782 17.7474 8.33153C17.9123 8.08486 18.0002 7.79485 18.0002 7.49818C18.0002 7.10035 17.8422 6.71882 17.5609 6.43752C17.2796 6.15621 16.8981 5.99818 16.5002 5.99818Z" fill="black" />
|
||||
<path d="M4.05423 15.1982L2.24723 13.3912C2.15505 13.299 2.08547 13.1867 2.04395 13.0632C2.00243 12.9396 1.9901 12.8081 2.00793 12.679C2.02575 12.5498 2.07325 12.4266 2.14669 12.3189C2.22013 12.2112 2.31752 12.1219 2.43123 12.0582L9.15323 8.28918C7.17353 10.3717 5.4607 12.6926 4.05423 15.1982ZM8.80023 19.9442L10.6072 21.7512C10.6994 21.8434 10.8117 21.9129 10.9352 21.9545C11.0588 21.996 11.1903 22.0083 11.3195 21.9905C11.4486 21.9727 11.5718 21.9252 11.6795 21.8517C11.7872 21.7783 11.8765 21.6809 11.9402 21.5672L15.7092 14.8442C13.6269 16.8245 11.3061 18.5377 8.80023 19.9442ZM7.04023 18.1832L12.5832 12.6402C12.7381 12.4759 12.8228 12.2577 12.8195 12.032C12.8161 11.8063 12.725 11.5907 12.5653 11.4311C12.4057 11.2714 12.1901 11.1803 11.9644 11.1769C11.7387 11.1736 11.5205 11.2583 11.3562 11.4132L5.81323 16.9562L7.04023 18.1832Z" fill="black" />
|
||||
</svg>
|
||||
</span>
|
||||
<!--end::Svg Icon-->
|
||||
</span>
|
||||
<span class="menu-title">My Jobs</span>
|
||||
</span>
|
||||
</div>
|
||||
<div class="menu-item">
|
||||
<span class="menu-link">
|
||||
<span class="menu-icon">
|
||||
<!--begin::Svg Icon | path: icons/duotune/general/gen002.svg-->
|
||||
<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">
|
||||
<path opacity="0.3" d="M4.05424 15.1982C8.34524 7.76818 13.5782 3.26318 20.9282 2.01418C21.0729 1.98837 21.2216 1.99789 21.3618 2.04193C21.502 2.08597 21.6294 2.16323 21.7333 2.26712C21.8372 2.37101 21.9144 2.49846 21.9585 2.63863C22.0025 2.7788 22.012 2.92754 21.9862 3.07218C20.7372 10.4222 16.2322 15.6552 8.80224 19.9462L4.05424 15.1982ZM3.81924 17.3372L2.63324 20.4482C2.58427 20.5765 2.5735 20.7163 2.6022 20.8507C2.63091 20.9851 2.69788 21.1082 2.79503 21.2054C2.89218 21.3025 3.01536 21.3695 3.14972 21.3982C3.28408 21.4269 3.42387 21.4161 3.55224 21.3672L6.66524 20.1802L3.81924 17.3372ZM16.5002 5.99818C16.2036 5.99818 15.9136 6.08615 15.6669 6.25097C15.4202 6.41579 15.228 6.65006 15.1144 6.92415C15.0009 7.19824 14.9712 7.49984 15.0291 7.79081C15.0869 8.08178 15.2298 8.34906 15.4396 8.55884C15.6494 8.76862 15.9166 8.91148 16.2076 8.96935C16.4986 9.02723 16.8002 8.99753 17.0743 8.884C17.3484 8.77046 17.5826 8.5782 17.7474 8.33153C17.9123 8.08486 18.0002 7.79485 18.0002 7.49818C18.0002 7.10035 17.8422 6.71882 17.5609 6.43752C17.2796 6.15621 16.8981 5.99818 16.5002 5.99818Z" fill="black" />
|
||||
<path d="M4.05423 15.1982L2.24723 13.3912C2.15505 13.299 2.08547 13.1867 2.04395 13.0632C2.00243 12.9396 1.9901 12.8081 2.00793 12.679C2.02575 12.5498 2.07325 12.4266 2.14669 12.3189C2.22013 12.2112 2.31752 12.1219 2.43123 12.0582L9.15323 8.28918C7.17353 10.3717 5.4607 12.6926 4.05423 15.1982ZM8.80023 19.9442L10.6072 21.7512C10.6994 21.8434 10.8117 21.9129 10.9352 21.9545C11.0588 21.996 11.1903 22.0083 11.3195 21.9905C11.4486 21.9727 11.5718 21.9252 11.6795 21.8517C11.7872 21.7783 11.8765 21.6809 11.9402 21.5672L15.7092 14.8442C13.6269 16.8245 11.3061 18.5377 8.80023 19.9442ZM7.04023 18.1832L12.5832 12.6402C12.7381 12.4759 12.8228 12.2577 12.8195 12.032C12.8161 11.8063 12.725 11.5907 12.5653 11.4311C12.4057 11.2714 12.1901 11.1803 11.9644 11.1769C11.7387 11.1736 11.5205 11.2583 11.3562 11.4132L5.81323 16.9562L7.04023 18.1832Z" fill="black" />
|
||||
</svg>
|
||||
</span>
|
||||
<!--end::Svg Icon-->
|
||||
</span>
|
||||
<span class="menu-title">My Jobs</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
</a>
|
||||
|
||||
|
||||
|
||||
<?php
|
||||
if ($_SESSION["active_offers_count"] > 0) {
|
||||
?>
|
||||
<<a href="/jobs/pendingoffer">
|
||||
<a href="/jobs/pendingoffer">
|
||||
<div class="menu-item">
|
||||
<span class="menu-link">
|
||||
<span class="menu-icon">
|
||||
@@ -227,7 +228,7 @@
|
||||
</span>
|
||||
<!--end::Svg Icon-->
|
||||
</span>
|
||||
<span class="menu-title">Active Offers [<?php echo $_SESSION["active_offers_count"]; ?>]</span>
|
||||
<span class="menu-title">Active Jobs[<?php echo $_SESSION["active_offers_count"]; ?>]</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<div class="card-title">
|
||||
<!--begin::User-->
|
||||
<div class="d-flex justify-content-center flex-column me-3">
|
||||
<a href="#" class="fs-4 fw-bolder text-gray-900 text-hover-primary me-1 mb-2 lh-1">Brian Cox</a>
|
||||
<a href="#" class="fs-4 fw-bolder text-gray-900 text-hover-primary me-1 mb-2 lh-1"><?=$job_id?></a>
|
||||
<!--begin::Info-->
|
||||
<div class="mb-0 lh-1">
|
||||
<span class="badge badge-success badge-circle w-10px h-10px me-1"></span>
|
||||
@@ -27,70 +27,84 @@
|
||||
<div class="card-body" id="kt_chat_messenger_body">
|
||||
<!--begin::Messages-->
|
||||
<div class="scroll-y me-n5 pe-5 h-300px h-lg-auto" data-kt-element="messages" data-kt-scroll="true" data-kt-scroll-activate="{default: false, lg: true}" data-kt-scroll-max-height="auto" data-kt-scroll-dependencies="#kt_header, #kt_toolbar, #kt_footer, #kt_chat_messenger_header, #kt_chat_messenger_footer" data-kt-scroll-wrappers="#kt_content, #kt_chat_messenger_body" data-kt-scroll-offset="5px">
|
||||
<!--begin::Message(in)-->
|
||||
<div class="d-flex justify-content-start mb-10">
|
||||
<!--begin::Wrapper-->
|
||||
<div class="d-flex flex-column align-items-start">
|
||||
<!--begin::User-->
|
||||
<div class="d-flex align-items-center mb-2">
|
||||
<!--begin::Avatar-->
|
||||
<div class="symbol symbol-35px symbol-circle">
|
||||
<img alt="Pic" src="assets/media/avatars/300-25.jpg" />
|
||||
|
||||
<?php
|
||||
foreach ($my_message_rows as $row)
|
||||
{
|
||||
if ($row['senders_id'] === $_SESSION['member_id'] ){
|
||||
?>
|
||||
<div class="d-flex justify-content-end mb-10">
|
||||
<div class="d-flex flex-column align-items-end">
|
||||
<div class="d-flex align-items-center mb-2">
|
||||
<div class="me-3">
|
||||
<span class="text-muted fs-7 mb-1"><?=$row['msg_date']?></span>
|
||||
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary ms-1"><?=$row['senders_name']?></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="p-5 rounded bg-light-primary text-dark fw-bold mw-lg-500px text-end"
|
||||
data-kt-element="message-text"><?=$row['msg']?></div>
|
||||
</div>
|
||||
<!--end::Avatar-->
|
||||
<!--begin::Details-->
|
||||
<div class="ms-3">
|
||||
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary me-1">Brian Cox</a>
|
||||
<span class="text-muted fs-7 mb-1">2 mins</span>
|
||||
</div>
|
||||
<!--end::Details-->
|
||||
</div>
|
||||
<!--end::User-->
|
||||
<!--begin::Text-->
|
||||
<div class="p-5 rounded bg-light-info text-dark fw-bold mw-lg-400px text-start" data-kt-element="message-text">How likely are you to recommend our company to your friends and family ?</div>
|
||||
<!--end::Text-->
|
||||
</div>
|
||||
<!--end::Wrapper-->
|
||||
</div>
|
||||
<!--end::Message(in)-->
|
||||
<!--begin::Message(out)-->
|
||||
<div class="d-flex justify-content-end mb-10">
|
||||
<!--begin::Wrapper-->
|
||||
<div class="d-flex flex-column align-items-end">
|
||||
<!--begin::User-->
|
||||
<div class="d-flex align-items-center mb-2">
|
||||
<!--begin::Details-->
|
||||
<div class="me-3">
|
||||
<span class="text-muted fs-7 mb-1">5 mins</span>
|
||||
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary ms-1">You</a>
|
||||
|
||||
<?
|
||||
|
||||
}else{
|
||||
?>
|
||||
<div class="d-flex justify-content-start mb-10">
|
||||
<div class="d-flex flex-column align-items-start">
|
||||
<div class="d-flex align-items-center mb-2">
|
||||
<div class="ms-3">
|
||||
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary me-1"><?=$row['senders_name']?></a>
|
||||
<span class="text-muted fs-7 mb-1"><?=$row['msg_date']?></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="p-5 rounded bg-light-info text-dark fw-bold mw-lg-500px text-start"
|
||||
data-kt-element="message-text"><?=$row['msg']?></div>
|
||||
</div>
|
||||
<!--end::Details-->
|
||||
<!--begin::Avatar-->
|
||||
<div class="symbol symbol-35px symbol-circle">
|
||||
<img alt="Pic" src="assets/media/avatars/300-1.jpg" />
|
||||
</div>
|
||||
<!--end::Avatar-->
|
||||
</div>
|
||||
<!--end::User-->
|
||||
<!--begin::Text-->
|
||||
<div class="p-5 rounded bg-light-primary text-dark fw-bold mw-lg-400px text-end" data-kt-element="message-text">Hey there, we’re just writing to let you know that you’ve been subscribed to a repository on GitHub.</div>
|
||||
<!--end::Text-->
|
||||
</div>
|
||||
<!--end::Wrapper-->
|
||||
</div>
|
||||
<!--end::Message(out)-->
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<!--end::Messages-->
|
||||
</div>
|
||||
<!--end::Card body-->
|
||||
<!--begin::Card footer-->
|
||||
<div class="card-footer pt-4" id="kt_chat_messenger_footer">
|
||||
<textarea class="form-control form-control-flush mb-3" rows="1" data-kt-element="input" placeholder="Type a message"></textarea>
|
||||
<div class="d-flex flex-stack">
|
||||
<div class="d-flex align-items-center me-2">
|
||||
<form name="job_message">
|
||||
<div class="card-footer pt-4" id="kt_chat_messenger_footer">
|
||||
<textarea name="yourmessage" class="form-control form-control-flush mb-3" rows="1" data-kt-element="input" placeholder="Type a message"></textarea>
|
||||
<div class="d-flex flex-stack">
|
||||
<div class="d-flex align-items-center me-2">
|
||||
|
||||
</div>
|
||||
<button id="submit_yourmessage_<?=$message_id?>" onclick="return replyThisMessage('<?=$job_id?>', <?=$message_id?>);" class="btn btn-primary" type="button" data-kt-element="send">Send</button>
|
||||
</div>
|
||||
<button class="btn btn-primary" type="button" data-kt-element="send">Send</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- /main content -->
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
function replyThisMessage(message_code,message_id) {
|
||||
if (document.job_message.yourmessage.value=='') {
|
||||
alert('Missing message!');
|
||||
return false;
|
||||
}
|
||||
|
||||
$('#submit_yourmessage_'+message_id).prop('disabled', true);
|
||||
$.ajax({
|
||||
url: "/member/replymessage?proc=REPLYMSG&message_code=" + message_code + "&message_id="+message_id+"&yourmessage=" + document.job_message.yourmessage.value
|
||||
}).done(function( data ) {
|
||||
$('#msg_result_'+message_id).html(data);
|
||||
document.job_message.yourmessage.value = '';
|
||||
$('#submit_yourmessage_'+message_id).prop('disabled', false);
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
// -->
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user