viithiisys / adminAcufuel

Download as
Browse Code ยป

Commit 226dc1e5717ce1e6005617ee0dd116dff6abea0f

Authored by Rishav
1 parent db8e1f992c
Exists in master

code changes according to requirement

Showing 8 changed files with 15 additions and 34 deletions   Show diff stats
app/views/fbo-admin/dashboard.controller.js
Diff comments   View file @226dc1e
... ... @@ -10,7 +10,6 @@
10 10 radioClass: 'iradio_square-green',
11 11 });
12 12 });
13   - $scope.showCompany = true;
14 13 $scope.userName = 'Dylan Goodwin';
15 14 $scope.essAccountId = true;
16 15 $("#esAccId").css({ opacity: 0.5 });
... ... @@ -78,9 +77,4 @@
78 77 }
79 78 }
80 79  
81   - $scope.editName = function(){
82   - $scope.showCompany = false;
83   -
84   - }
85   -
86 80 });
87 81 \ No newline at end of file
... ...
app/views/fbo-admin/dashboard.html
Diff comments   View file @226dc1e
1 1 </div>
2 2 <div class="row wrapper border-bottom white-bg page-heading">
3 3 <div class="col-lg-8">
4   - <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
5   - <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
  4 + <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2> -->
  5 + <div style="margin-top: 20px;"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
6 6 </div>
7 7 <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
8 8 <button type="button" class="btn btn-default btn-sm" ui-sref="index.fboAdmin">Cancel</button>
... ... @@ -36,7 +36,7 @@
36 36 <form role="form">
37 37 <div class="col-sm-6 b-r">
38 38 <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
39   - <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
  39 + <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
40 40 <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
41 41 <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
42 42 <!-- <div>
... ...
app/views/fbo-flight/flight.html
Diff comments   View file @226dc1e
1 1 </div>
2 2 <div class="row wrapper border-bottom white-bg page-heading">
3 3 <div class="col-lg-8">
4   - <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
5   - <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
  4 + <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2> -->
  5 + <div style="margin-top: 20px;"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
6 6 </div>
7 7 <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
8 8 <button type="button" class="btn btn-default btn-sm" ui-sref="index.flightDept">Cancel</button>
... ... @@ -36,7 +36,7 @@
36 36 <form role="form">
37 37 <div class="col-sm-6 b-r">
38 38 <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
39   - <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
  39 + <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
40 40 <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
41 41 <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
42 42 <!-- <div>
... ...
app/views/fbo-flight/flightDept.controller.js
Diff comments   View file @226dc1e
... ... @@ -4,11 +4,6 @@
4 4 angular.module('acuefuel')
5 5  
6 6 .controller('FlightDeptController', function ($scope, $uibModal, FBOFlight) {
7   - $scope.showCompany = true;
8   - $scope.editName = function(){
9   - $scope.showCompany = false;
10   -
11   - }
12 7 $scope.data = {};
13 8 $scope.user = {};
14 9 $scope.aircraft = {};
... ... @@ -110,7 +105,7 @@
110 105 toastr.error('Please Add Contact Information', {
111 106 closeButton: true
112 107 })
113   - $('#myModal4').modal('show');
  108 + $('#myModal4').modal('hide');
114 109 }else{
115 110 $('#myModal4').modal('show');
116 111 }
... ...
app/views/updateAllFBO/updateAllFBO.controller.js
Diff comments   View file @226dc1e
... ... @@ -11,11 +11,7 @@
11 11 });
12 12  
13 13 });
14   - $scope.showCompany = true;
15   - $scope.editName = function(){
16   - $scope.showCompany = false;
17   -
18   - }
  14 +
19 15 $scope.feature = {};
20 16 var userProfileID = $stateParams.id;
21 17 UpdateAllFBO.getALlFBOData(userProfileID).then(function(result) {
... ...
app/views/updateAllFBO/updateAllFBO.html
Diff comments   View file @226dc1e
1 1 </div>
2 2 <div class="row wrapper border-bottom white-bg page-heading">
3 3 <div class="col-lg-3">
4   - <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
5   - <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
  4 + <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2> -->
  5 + <div style="margin-top: 20px;"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
6 6 </div>
7 7 <div class="col-lg-3" style="margin-top: 20px;">
8 8 <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
... ... @@ -39,7 +39,7 @@
39 39 <form role="form">
40 40 <div class="col-sm-6 b-r">
41 41 <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
42   - <!-- <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
  42 + <!-- <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
43 43 <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
44 44 <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
45 45 <!-- <div>
... ...
app/views/updateFBODept/updateFBODept.controller.js
Diff comments   View file @226dc1e
... ... @@ -4,11 +4,7 @@
4 4 angular.module('acuefuel')
5 5  
6 6 .controller('updateFBODeptController', function($scope, $stateParams, UpdateAllFBODept, UpdateAllFBO, FBOFlight) {
7   - $scope.showCompany = true;
8   - $scope.editName = function(){
9   - $scope.showCompany = false;
10   -
11   - }
  7 +
12 8 $scope.showPayments = true;
13 9 $scope.aircraft = {};
14 10 $scope.updateData = {};
... ...
app/views/updateFBODept/updateFBODept.html
Diff comments   View file @226dc1e
1 1  
2 2 <div class="row wrapper border-bottom white-bg page-heading">
3 3 <div class="col-lg-3">
4   - <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
5   - <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
  4 + <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2> -->
  5 + <div style="margin-top: 20px;"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
6 6 </div>
7 7 <div class="col-lg-3" style="margin-top: 20px;">
8 8 <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
... ... @@ -38,7 +38,7 @@
38 38 <form role="form">
39 39 <div class="col-sm-6 b-r">
40 40 <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
41   - <!-- <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
  41 + <!-- <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
42 42 <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
43 43 <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
44 44 <!-- <div>
... ...