Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadcast details changes : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-06-01 11:32:29 +05:30
parent c6afe2a083
commit dfa1ed92c0
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/controllers/Broadcast_Controller.php
View File

@ -91,7 +91,7 @@ class Broadcast_Controller extends REST_Controller {
public function getSMSGroupDetails_post() { public function getSMSGroupDetails_post() {
$reqData = $this->post('data'); $reqData = $this->post('data');
$reqDataBy = $this->post('localReqDetails'); $reqDataBy = $this->post('requestDetails');
$getMegDetails = $this->broadcast_model->getSMSGroupDetails($reqData, $reqDataBy); // Check if the employee exist $getMegDetails = $this->broadcast_model->getSMSGroupDetails($reqData, $reqDataBy); // Check if the employee exist
if ($getMegDetails) { if ($getMegDetails) {
$getMegDetails['status'] = REST_Controller::HTTP_OK; $getMegDetails['status'] = REST_Controller::HTTP_OK;

2
Apollo/api/application/models/Broadcast_model.php
View File

@ -124,6 +124,8 @@ class Broadcast_model extends CI_Model {
$querys = "SELECT t1.*, t2.DeliveredStatus, t2.DeliveredOn FROM T_BroadcastStatus as t1 $querys = "SELECT t1.*, t2.DeliveredStatus, t2.DeliveredOn FROM T_BroadcastStatus as t1
LEFT JOIN T_BroadcastDeliveryCron as t2 ON t2.MsgId = t1.MsgId LEFT JOIN T_BroadcastDeliveryCron as t2 ON t2.MsgId = t1.MsgId
WHERE t1.MsgGroup = '$reqData' AND t1.BranchCode='$localBranch' ORDER BY t1.CreatedOn DESC"; WHERE t1.MsgGroup = '$reqData' AND t1.BranchCode='$localBranch' ORDER BY t1.CreatedOn DESC";
// echo $querys;exit();
$smsSendGroupDetails = $this->db->query($querys); $smsSendGroupDetails = $this->db->query($querys);
$smsSendGroupDetailsList = $smsSendGroupDetails->result(); $smsSendGroupDetailsList = $smsSendGroupDetails->result();
$results['smsSendGroupDetailsListStatus'] = true; $results['smsSendGroupDetailsListStatus'] = true;

18
Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
View File

@ -308,17 +308,29 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-4">
<label>Mobile Numbers : <span class="symbol required"></span> <label>Mobile Numbers : <span class="symbol required"></span>
</label> </label>
<div>
<input type="text" class="form-control inputCls" <input type="text" class="form-control inputCls"
ng-model="mobileNumList.mobile" name="mobile" ng-pattern="/^[0-9-+]*$/" minlength="6" maxlength="13"> ng-model="mobileNumList.mobile" name="mobile" ng-pattern="/^[0-9-+]*$/" minlength="6" maxlength="13">
<i ng-click="composeMsgNumber()" class="addBtn" >add</i> <span class="error text-small block" ng-if="addressForm.mobile.$error.pattern && addressForm.mobile.$error.minlength && addressForm.mobile.$error.maxlength">Valid Mobile is Required </span>
<!--<span class="error text-small block" ng-if="addressForm.mobile.$error.pattern && addressForm.mobile.$error.minlength && addressForm.mobile.$error.maxlength">Valid Mobile is Required </span>--> </div>
<br>
<div>
<i ng-click="composeMsgNumber()" class="addBtn" >add</i>
</div>
<!--ng-click="addContactsList(mobileNumList)"--> <!--ng-click="addContactsList(mobileNumList)"-->
</div> </div>
<div class="col-md-2">
<label>
<!--Mobile Numbers : <span class="symbol required"></span>-->
</label>
<!--<span ng-click="composeMsgNumber()" class="addBtn" >add</span>-->
</div>
<div class="col-md-6"> <div class="col-md-6">
<div class="mobileNumberList"> <div class="mobileNumberList">
<ul> <ul>