viithiisys / Acufuel

Browse Code »

Commit 98b2beef177b989f35ef0c2162f1dd6c79849785

Authored by Swarn Singh 2017-06-08 08:57:02 -0400

1 parent d011f511c9

Exists in master

contact view go back bug fixed

Showing 2 changed files with 5 additions and 0 deletions Show diff stats

app/partials/viewcontact/viewcontact.controller.js

Diff comments View file @98b2bee

 'use strict';
  //Load controller
   angular.module('acufuel')
 	.controller('viewcontactController', ['$scope', '$stateParams', '$state', 'ViewcontactService', 'ViewCompanyService', function($scope, $stateParams, $state, ViewcontactService, ViewCompanyService) {
         $scope.showLoader = true;
         $scope.showUpdateBtn = false;
 	    var contactId = $stateParams.id;
 	    $scope.contactDetail = {};
         var contactCompanyId = "";
         ViewcontactService.getContact(contactId).then(function(result) {
           $scope.contactDetail = result;
           $scope.showLoader = false;
           contactCompanyId = result.owner.id;
         })
+        $scope.goBack = function(){
+            window.history.back();
+        }
         $scope.contactIdList = {};
         var index;
         var one = 1;
         var selectedId;
         ViewcontactService.getContactsList(contactId).then(function(list){
         	$scope.contactIdList = list;
 			index = $scope.contactIdList.indexOf(contactId);
 			selectedId = $scope.contactIdList[index];
         })
         $scope.nextContact = function(){
             $scope.showLoader = true;
         	index = index + one;
         	selectedId = $scope.contactIdList[index];
 		        ViewcontactService.getContact(selectedId).then(function(result) {
 			    $scope.contactDetail = result;
                 $scope.showLoader = false;
 			})
         }
         $scope.prevContact = function(){
             $scope.showLoader = true;
         	index = index - one;
         	selectedId = $scope.contactIdList[index];
 		        ViewcontactService.getContact(selectedId).then(function(result) {
 			       $scope.contactDetail = result;
                    $scope.showLoader = false;
 			})
         }
         $scope.changePriceEmail = function(id){
             var statusData = "status=" + $scope.contactDetail.priceEmail;
             ViewcontactService.changePriceEmail(id, statusData).then(function(result) {
                 if(result.success){
                     $('#toogleMail').css('display', 'block');
                     if($scope.contactDetail.priceEmail == true){
                         $scope.messageText = 'You have enabled price distribution for this contact';
                     }else{
                         $scope.messageText = 'You have disabled price distribution for this contact';
                     }
                 }
             })
         }
         $scope.cancelToogle = function(){
           $('#toogleMail').css('display', 'none');
         }
         $scope.disableNext = true;
         $scope.disablePrev = true;
         setInterval(function(){
         	var checkMaxLength = $scope.contactIdList.length - one;
         	if (index === checkMaxLength) {
         		$scope.disableNext = true;
         	}else{
         		$scope.disableNext = false;
         	}
         	if (index === 0) {
         		$scope.disablePrev = true;
         	}else{
         		$scope.disablePrev = false;
         	}
         }, 1);
         $scope.editName = true;
         $scope.editCompany = true;
         $scope.editAddress = true;
         $scope.editPhone = true;
         $scope.editMobile = true;
         $scope.editEmail = true;
         $scope.editContactNotes = true;
         $scope.nameEdit = function(){
         	$scope.editName = false;
             $scope.showUpdateBtn = true;
         }
         $scope.addressEdit = function(){
         	$scope.editAddress = false;
             $scope.showUpdateBtn = true;
         }
         $scope.phoneEdit = function(){
         	$scope.editPhone = false;
             $scope.showUpdateBtn = true;
         }
         $scope.mobileEdit = function(){
         	$scope.editMobile = false;
             $scope.showUpdateBtn = true;
         }
         $scope.emailEdit = function(){
         	$scope.editEmail = false;
             $scope.showUpdateBtn = true;
         }
         $scope.notesEdit = function(){
         	$scope.editContactNotes = false;
             $scope.showUpdateBtn = true;
         }
         $scope.conData = {};
         $scope.contactData = {};
         $scope.contactData.contactList = [];
         $scope.updateContact = function(data){
             $scope.showLoader = true;
         	$scope.editName = true;
 	        $scope.editCompany = true;
 	        $scope.editAddress = true;
 	        $scope.editPhone = true;
 	        $scope.editMobile = true;
 	        $scope.editEmail = true;
 	        $scope.editContactNotes = true;
 	        $scope.conData.address = data.address;
 	        $scope.conData.email = data.email;
 	        $scope.conData.firstName = data.firstName;
 	        $scope.conData.id = data.id;
 	        $scope.conData.lastName = data.lastName;
 	        $scope.conData.mobilePhone = data.mobilePhone;
 	        $scope.conData.note = data.note;
 	        $scope.conData.password = data.password;
 	        $scope.conData.priceEmail = data.priceEmail;
 	        $scope.conData.primaryContact = data.primaryContact;
 	        $scope.conData.title = data.title;
 	        $scope.conData.userName = data.userName;
 	        $scope.conData.workPhone = data.workPhone;
 	        $scope.conData.companyId = data.owner.id;
 	        $scope.contactData.contactList.push($scope.conData);
 	        $scope.contactData.contactList.push();
 	        ViewcontactService.updateContact($scope.contactData).then(function(result) {
 	        	if(result.success){
 	            	toastr.success(''+result.success+'', {
 	            		closeButton: true
 	            	})
                     $scope.showUpdateBtn = false;
 	            }else{
 	            	toastr.error(''+result.statusText+'', {
 	                	closeButton: true
 	                })
 	            }
                 $scope.showLoader = false;
 	        })
         }
         $scope.cancelContact = function(){
             $scope.editName = true;
             $scope.editCompany = true;
             $scope.editAddress = true;
             $scope.editPhone = true;
             $scope.editMobile = true;
             $scope.editEmail = true;
             $scope.editContactNotes = true;
             $scope.showUpdateBtn = false;
         }
         $scope.checkPrimaryContact = function(companyId){
             if($scope.contactDetail.primaryContact == true){
             ViewCompanyService.checkPrimaryContact(companyId).then(function(result) {
               console.log(result)
               if(result.status == 422){
                 $('#primaryContact').css('display', 'block');
               }
             })
           }
         }
         $scope.cancelPrimaryContact = function(){
           $('#primaryContact').css('display', 'none');
           $scope.contactDetail.primaryContact = false;
           console.log($scope.contactDetail.primaryContact)
         }
         $scope.sendPrimaryContact = function(id){
           $('#primaryContact').css('display', 'none');
             var priamryContactData = "companyContactId=" + id + "&primary=" + $scope.contactDetail.primaryContact;
             ViewCompanyService.addPrimaryContact(priamryContactData).then(function(result) {
               console.log(result)
             })
         }
         var deleteContact = "";
         $scope.deleteContact = function(id){
             $('#delete2').css('display', 'block');
             deleteContact = id;
         }
         $scope.contactDelete = function(){
           ViewcontactService.deleteContact(deleteContact).then(function(result) {
             console.log(result)
             if(result.success){
                 deleteContact = "";
                 $('#delete2').css('display', 'none');
                 toastr.success(''+result.success+'', {
                     closeButton: true
                 })
                 $state.go('app.viewCompany', {"id": contactCompanyId});
             }
           })
         }
         $scope.cancelDelete = function(){
             $('#delete2').css('display', 'none');
         }
     }]);

app/partials/viewcontact/viewcontact.html

Diff comments View file @98b2bee

 <style type="text/css">
   .toggle.btn{
     width: 140px !important;
   }
 </style>
 <div class="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="container">
    <div class="row">
       <div class="col-md-10" style="padding-right: 60px; margin-bottom: 30px;">
          <div class="widget">
             <div class="widget-header">
                <i class="icon-pencil"></i>
                 <i class="fa fa-building-o" aria-hidden="true"></i>
                <h3>Antioch Flight Department</h3>
+               <i class="fa fa-times" areia-hidden="true" ng-click="goBack()" style="float: right; margin-top: 10px; margin-right: 10px; cursor: pointer;"></i>
             </div>
             <div class="widget-content" style="padding-left: 0; padding-right: 0; ">
                <div class="container">
                   <div style="margin-bottom: 25px;">
                     <button ng-disabled="disablePrev" class="newButtons" ng-click="prevContact()">
                       <i class="fa fa-long-arrow-left" aria-hidden="true"></i>
                       Previous Contact
                     </button>
                     <button ng-disabled="disableNext" class="newButtons" ng-click="nextContact()">
                       Next Contact
                       <i class="fa fa-long-arrow-right" aria-hidden="true"></i>
                     </button>
                   </div>
                   <div class="row">
                      <div class="col-md-6" style="margin-left: 20px;">
                      <div class="widget stacked">
                         <div class="widget-header">
                            <i class="fa fa-building-o" aria-hidden="true"></i>
                            <h3 style="margin-right: 0px;">Contact Detail</h3>
                            <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteContact(contactDetail.id)" style="color: white;" aria-hidden="true"></i>
                             <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
                               <toggle ng-model="contactDetail.priceEmail" style="width: 140px;" ng-change="changePriceEmail(contactDetail.id)" size="customToogle" on="PRICE EMAIL ON" off="PRICE EMAIL OFF"></toggle>
                             </div>
                         </div>
                         <div class="widget-content">
                            <div class="row" style="margin-left:0px">
                               <div class="col-md-6" style="padding-left: 0px;">
                                  <h3>
                                     <b ng-show="editName" style="color:#F90;">{{contactDetail.firstName}} {{contactDetail.lastName}}</b>
                                     <input type="text" ng-hide="editName" class="form-control" style="width: 49%; float: left; margin-right: 1%;" ng-model="contactDetail.firstName">
                                     <input type="text" ng-hide="editName" class="form-control" style="width: 49%;" ng-model="contactDetail.lastName">
                                     &nbsp;<i class="fa fa-pencil-square-o" ng-show="editName" ng-click="nameEdit()" style="font-size: 11px;" aria-hidden="true"></i>
                                  </h3>
                                  {{contactDetail.owner.companyName}}
                               </div>
                               <div class="col-md-6">
                                   <div style="margin-bottom: 10px" class="input-group email-password">
                                       <span class="input-group-addon email-password"><i class="glyphicon glyphicon-user email-password-icon"></i></span>
                                       <input id="login-username" type="text" ng-model="contactDetail.userName" class="form-control email-password" placeholder="username or email">
                                   </div>
                                  <!--  <div class="input-group email-password">
                                       <span class="input-group-addon email-password"><i class="fa fa-key" aria-hidden="true"></i></span>
                                       <input id="login-password" type="password" class="form-control email-password" name="password" placeholder="password">
                                   </div> -->
                               </div>
                            </div>
                            <div>
                               <p>
                                 <span ng-show="editAddress">
                                   <i class="fa fa-map-marker"></i> {{contactDetail.address}} &nbsp;
                                   <i class="fa fa-pencil-square-o" ng-click="addressEdit()" style="font-size: 11px;" aria-hidden="true"></i>
                                 </span>
                                 <input type="text" ng-hide="editAddress" style="width: 50%;" class="form-control" ng-model="contactDetail.address">
                               </p>
                               <p ng-show="editPhone"><i class="fa fa-phone"></i> {{contactDetail.mobilePhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="phoneEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
                               <p ng-hide="editPhone">
                                 <input type="text" style="width: 50%;" ng-model="contactDetail.mobilePhone" class="form-control">
                               </p>
                               <p ng-show="editMobile"><i class="fa fa-mobile"></i> {{contactDetail.workPhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="mobileEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
                               <p ng-hide="editMobile">
                                 <input type="text" style="width: 50%;" ng-model="contactDetail.workPhone" class="form-control">
                               </p>
                               <p ng-show="editEmail"><i class="fa fa-envelope"></i> {{contactDetail.email}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="emailEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
                               <p ng-hide="editEmail">
                                 <input type="email" style="width: 50%;" ng-model="contactDetail.email" class="form-control">
                               </p>
                               <div>
                                 <input type="checkbox" ng-checked="contactDetail.primaryContact" ng-click="checkPrimaryContact(contactDetail.owner.id)" ng-model="contactDetail.primaryContact">&nbsp;
                                 <span>Primary Contact </span>
                              </div>
                            </div>
                            </br>
                            <div>
                               <p><b>Contact Notes</b> &nbsp;<i ng-show="editContactNotes" class="fa fa-pencil-square-o" ng-click="notesEdit()" style="font-size: 11px;" aria-hidden="true"></i>
                               <p ng-show="editContactNotes">{{contactDetail.note}}</p>
                               <p ng-hide="editContactNotes">
                                 <textarea ng-model="contactDetail.note" class="form-control" style="resize: vertical;"></textarea>
                               </p>
                               <div>
                                 <button ng-click="updateContact(contactDetail)" ng-show="showUpdateBtn" class="btn btn-success pull-left">Update Contact</button>
                                 <button ng-click="cancelContact()" style="margin-left: 5px;" ng-show="showUpdateBtn" class="btn btn-default pull-left">Cancel</button>
                                 <button type="button" class="btn btn-primary pull-right">Send Price to This Contacts</button>
                                 <div class="clearfix"></div>
                               </div>
                            </div>
                            <!-- <div class="col-md-6">
                               <button type="button" class="btn btn-primary">Send Price to This Contacts</button>
                            </div> -->
                         </div>
                      </div>
                   </div>
                </div>
             </div>
          </div>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="primaryContact">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <img src="img/info.png" style="width: 50px;">
                </td>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to set this person as your primary contact?</p>
                </td>
             </tr>
          </table>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="sendPrimaryContact(contactDetail.id)">Yes</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelPrimaryContact()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="toogleMail">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <!-- <td>
                   <img src="" style="width: 50px;">
                </td> -->
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;text-align: center;">{{messageText}}</p>
                </td>
             </tr>
          </table>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelToogle()">Cancel</button>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="delete2">
    <div class="customModalInner" style="max-width: 400px;">
       <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
          <table>
             <tr>
                <td>
                   <img src="img/info.png" style="width: 50px;">
                </td>
                <td>
                   <p style="padding: 5px 10px; margin-bottom: 0;">Please confirm! Are you sure you want to DELETE this Contact?</p>
                </td>
             </tr>
          </table>
       </div>
       <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="contactDelete()">Accept</button>
          <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDelete()">Cancel</button>
       </div>
    </div>
 </div>