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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
resicovenba 2017-12-27 12:02:54 +05:30
commit 6e12970fee
4 changed files with 70 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,8 @@ class Call_Tracking_Controller extends REST_Controller {
$tracking_details['AssignedTo'] = $this->post('assignedTo'); $tracking_details['AssignedTo'] = $this->post('assignedTo');
$tracking_details['StatusCode'] = $this->post('status'); $tracking_details['StatusCode'] = $this->post('status');
$tracking_details['ReferredBy'] = $this->post('referedBy'); $tracking_details['ReferredBy'] = $this->post('referedBy');
$tracking_details['AlternateMobile'] = $this->post('alterMobile');
$tracking_details['Address'] = $this->post('address');
$tracking_details['CreatedBy'] = $this->post('createdBy'); $tracking_details['CreatedBy'] = $this->post('createdBy');
$tracking_details['CreatedOn'] = $now->format('Y-m-d H:i:s'); $tracking_details['CreatedOn'] = $now->format('Y-m-d H:i:s');
//store tracking followup details //store tracking followup details

13
Apollo/assets/js/controllers/callTrackingCtrl.js
View File

@ -17,7 +17,9 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
"status": "", "status": "",
"referedBy": '', "referedBy": '',
"comments":'', "comments":'',
"enquiryStatus":'' "enquiryStatus":'',
"alterMobileNumber":'',
"address":''
}; };
//get current date //get current date
@ -127,6 +129,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
status: myModel.status, status: myModel.status,
referedBy: myModel.referedBy, referedBy: myModel.referedBy,
comments:myModel.comments, comments:myModel.comments,
alterMobile:myModel.alterMobileNumber,
address:myModel.address,
enquiryStatus:myModel.enquiryStatus, enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
@ -202,6 +206,9 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.myModel.studentName=response.data.existLeadDetails.LeadName; $scope.myModel.studentName=response.data.existLeadDetails.LeadName;
$scope.myModel.universityName=response.data.existLeadDetails.University; $scope.myModel.universityName=response.data.existLeadDetails.University;
$scope.myModel.courseName=response.data.existLeadDetails.Course; $scope.myModel.courseName=response.data.existLeadDetails.Course;
$scope.myModel.alterMobileNumber=response.data.existLeadDetails.AlternateMobile;
$scope.myModel.address=response.data.existLeadDetails.Address;
// find index for university drop down list // find index for university drop down list
/* for(var i in $scope.university) { /* for(var i in $scope.university) {
if($scope.university[i].universityID==response.data.existLeadDetails.UniversityID){ if($scope.university[i].universityID==response.data.existLeadDetails.UniversityID){
@ -457,7 +464,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
} }
else{ else{
swal("EMPTY!", "This is an last tracking details.so please go previous", "info"); swal("EMPTY!", "No more records to display", "info");
} }
@ -621,7 +628,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
} }
else{ else{
swal("EMPTY!", "This is an last tracking details.so please go next", "info"); swal("EMPTY!", "No more records to display", "info");
} }

54
Apollo/assets/views/callTrackingDetails.html
View File

@ -139,7 +139,7 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10">
<tr ng-click="setEditId(p,search,search2,search3,search4,search5);" title="Click to view tracking details"> <tr ng-click="setEditId(p,search,search2,search3,search4,search5);">
<td><a class="text-orange" ng-click="setEditId(p,search,search2,search3,search4,search5);">{{p.TrackingID}}</a></td> <td><a class="text-orange" ng-click="setEditId(p,search,search2,search3,search4,search5);">{{p.TrackingID}}</a></td>
<td>{{p.followupDetails }}</td> <td>{{p.followupDetails }}</td>
<td>{{p.LeadName}}</td> <td>{{p.LeadName}}</td>
@ -156,8 +156,18 @@
padding: 0.5em 0.6em;" aria-hidden="true"></b> padding: 0.5em 0.6em;" aria-hidden="true"></b>
</a></td>--> </a></td>-->
<td class="hidden-xs" ng-if="p.statusName!='CLOSE'"><span class="label label-sm label-warning">{{p.statusName}}</span></td> <td ng-if="p.statusName!='CLOSE'">
<td class="hidden-xs" ng-if="p.statusName=='CLOSE'"><span class="label label-sm label-success">{{p.statusName}}</span></td>
<a class="text-dark" tooltip="Click To View">
<span class="label label-sm label-warning"> {{p.statusName}} </span>
</a>
<!--<span class="label label-sm label-warning">{{p.statusName}}</span>--></td>
<td ng-if="p.statusName=='CLOSE'">
<a class="text-dark" tooltip="Click To View">
<span class="label label-sm label-success"> {{p.statusName}} </span>
</a>
<!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td>
</tr> </tr>
@ -428,6 +438,22 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.altermobilenumber.$dirty && Form.altermobilenumber.$invalid, 'has-success':Form.altermobilenumber.$valid}">
<label class="control-label">
Alternate Mobile Number
</label>
<input type="text" placeholder="Enter Alter Mobile Number"
autofocus tabindex="9" class="form-control" name="altermobilenumber" id="altermobilenumber" ng-minlength="10" ng-maxlength="12"
ng-model="myModel.alterMobileNumber" ng-pattern="/^[0-9]*$/" />
<!--<span class="error text-small block"
ng-if="Form.altermobilenumber.$dirty && Form.altermobilenumber.$invalid"
ng-hide="Form.altermobilenumber.$error.maxlength || Form.altermobilenumber.$error.minlength || Form.altermobilenumber.$error.pattern">Phone number is required</span>-->
<span class="error text-small block"
ng-if="Form.altermobilenumber.$error.maxlength || Form.altermobilenumber.$error.minlength || Form.altermobilenumber.$error.pattern">Enter a valid phone number</span>
</div>
<div class="col-md-3 form-group" <div class="col-md-3 form-group"
ng-class="{'has-error':Form.refered.$dirty && Form.refered.$invalid, 'has-success':Form.refered.$valid}"> ng-class="{'has-error':Form.refered.$dirty && Form.refered.$invalid, 'has-success':Form.refered.$valid}">
<label class="control-label"> <label class="control-label">
@ -435,19 +461,31 @@
</label> </label>
<input type="text" placeholder="Enter Referred By Name" <input type="text" placeholder="Enter Referred By Name"
tabindex="9" class="form-control" name="refered" tabindex="10" class="form-control" name="refered"
ng-model="myModel.referedBy" ng-pattern="/^[a-zA-Z.\s]*$/"/> ng-model="myModel.referedBy" ng-pattern="/^[a-zA-Z.\s]*$/"/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.refered.$dirty && Form.refered.$error.pattern">Invalid refered by name </span> ng-if="Form.refered.$dirty && Form.refered.$error.pattern">Invalid refered by name </span>
</div> </div>
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.address.$dirty && Form.address.$invalid, 'has-success':Form.address.$valid}">
<label class="control-label">
Address
</label>
<textarea placeholder="Enter Address" tabindex="11"
class="form-control textdsc" name="address"
ng-model="myModel.address"></textarea>
<!--<span class="error text-small block"
ng-if="Form.address.$dirty && Form.address.$invalid">Address is required</span>-->
</div>
<div class="col-md-4 form-group"
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.comments.$dirty && Form.comments.$invalid, 'has-success':Form.comments.$valid}"> ng-class="{'has-error':Form.comments.$dirty && Form.comments.$invalid, 'has-success':Form.comments.$valid}">
<label> <label>
Comments <span class="symbol required"></span> Comments <span class="symbol required"></span>
</label> </label>
<textarea placeholder="Enter Comments" tabindex="10" <textarea placeholder="Enter Comments" tabindex="12"
class="form-control textdsc" name="comments" class="form-control textdsc" name="comments"
ng-model="myModel.comments" required></textarea> ng-model="myModel.comments" required></textarea>
<span class="error text-small block" <span class="error text-small block"
@ -463,13 +501,13 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-right"> <div class="pull-right">
<button tabindex="11" type="submit" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in"> <button tabindex="13" type="submit" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
Submit Submit
</button> </button>
<!-- <button type="submit" class="btn btn-success btn-o" tabindex="8"> <!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
Submit Submit
</button>--> </button>-->
<button type="reset" class="btn btn-warning btn-wide" tabindex="12" <button type="reset" class="btn btn-warning btn-wide" tabindex="14"
ng-click="branchForm.reset(Form)"> ng-click="branchForm.reset(Form)">
Reset Reset
</button> </button>

12
Apollo/assets/views/callTrackingFollowup.html
View File

@ -90,6 +90,18 @@
{{followupDetails.CourseName}} {{followupDetails.CourseName}}
</td> </td>
</tr> </tr>
<tr>
<td>Alternate Mobile</td>
<td>
{{followupDetails.AlternateMobile}} </td>
</tr>
<tr>
<td>Address</td>
<td>
{{followupDetails.Address}} </td>
</tr>
</tbody> </tbody>
</table> </table>