add/view leads emailid added

Apollo/api/application/controllers/Call_Tracking_Controller.php

@@ -105,6 +105,8 @@ class Call_Tracking_Controller extends REST_Controller {
         $tracking_details['ReferredBy'] = $this->post('referedBy');
         $tracking_details['AlternateMobile'] = $this->post('alterMobile');
         $tracking_details['Address'] = $this->post('address');
+        $tracking_details['EmailID'] =$this->post('emailId');
+        
         $tracking_details['CreatedBy'] = $this->post('createdBy');
         $tracking_details['CreatedOn'] = $now->format('Y-m-d H:i:s');
         $tracking_details['UpdatedOn'] = $now->format('Y-m-d H:i:s');
@@ -423,7 +425,7 @@ class Call_Tracking_Controller extends REST_Controller {
     */
     public function autoAddlead_post(){
         $student = $this->post('student');
-		$comments = $this->post('comments');
+        $comments = $this->post('comments');
         //print_r($comments);die;
         if(!empty($student)){
         $now = new DateTime();
@@ -458,7 +460,7 @@ class Call_Tracking_Controller extends REST_Controller {
     $tracking_followup_details['StatusName'] = $this->post('status');
     $tracking_followup_details['AssignedStaff'] = $this->post('assignedTo');
     //print_r(array($lead_details,$tracking_details,$tracking_followup_details));
-	
+    
     $leadDetails['leadDetails'] = $this->Calltracking_model->getaddautocall($lead_details,$tracking_details,$tracking_followup_details,$CreatedBy);// Check if the users data store contains users (in case the database result returns NULL)
         
         

Apollo/assets/js/controllers/callTrackingCtrl.js

@@ -241,6 +241,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
     $scope.trackForm = {
         submit: function (form, myModel,loading) {
 
+
+
             if(isNaN(myModel.date)){
                 $scope.nextFollowupDate = myModel.date;
 
@@ -284,6 +286,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
 
                 }*/
 
+ // console.log(myModel.emailId);
                 var addLead = {
                     method: 'POST',
                     url: apiPoint.url + 'addLeadTrackingDetails/',
@@ -303,12 +306,16 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
                         comments:myModel.comments,
                         alterMobile:myModel.alterMobileNumber,
                         address:myModel.address,
+                        emailId:myModel.emailId,
                         enquiryStatus:myModel.enquiryStatus,
                         createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
                         branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
 
                     }
                 };
+
+              
+
                 $http(addLead).then(function (response) {
                     if (response.data.status==200 && response.data.leadStatus) {
                         $scope.ldloading1[loading.replace('-', '_')] = false;

Apollo/assets/views/callTrackingDetails.html

@@ -101,16 +101,16 @@
                                     <div class="col-md-2">
                                         <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="2" placeholder="Search anything" />
                                     </div>
-									<!-- Search By Activity-->
+                                    <!-- Search By Activity-->
                                      <div class="col-md-2 col-md">
                                         <input class="form-control" type="text" ng-model="search3.ActivityName" id="search3" autofocus tabindex="3" placeholder=" Activity" />
                                     </div>  
-									<!-- Search By Assign To-->
+                                    <!-- Search By Assign To-->
-									<div class="col-md-2">
+                                    <div class="col-md-2">
                                         <input class="form-control" type="text" ng-model="search4.Firstname" id="search4" autofocus tabindex="4" placeholder=" Assigned To" />
                                     </div> 
-									<!-- Search By Status-->
+                                    <!-- Search By Status-->
-									<div class="col-md-2">
+                                    <div class="col-md-2">
                                         <input class="form-control" type="text" ng-model="search5.statusName" id="search5" autofocus tabindex="5" placeholder="Status" />
                                     </div> 
                                     <br><br>
@@ -577,6 +577,19 @@
                                             <span class="error text-small block"
                                                   ng-if="Form.refered.$dirty && Form.refered.$error.pattern">Invalid referred by name </span>
                                         </div>
+
+
+                                            <div class=" col-md-3 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
+                                                <label>
+                                                Email ID 
+                                                </label>
+                                                <input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
+                                                    ng-model="myModel.emailId" >
+                                               <!--  <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> -->
+                                                <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
+                                            </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">
@@ -590,7 +603,17 @@
                                         </div>
 
 
-                                        <div class="col-md-3 form-group"
+                                  
+
+
+                                    </div>
+
+
+ <div class="row"> 
+     
+
+
+                                                  <div class="col-md-3 form-group"
                                              ng-class="{'has-error':Form.comments.$dirty && Form.comments.$invalid, 'has-success':Form.comments.$valid}">
                                             <label>
                                                 Comments <span class="symbol required"></span>
@@ -605,10 +628,8 @@
                                         </div>
 
 
-                                    </div>
-
-
 
+ </div>
 
                                     <div class="col-md-12">
                                         <div class="pull-right">