account setting modal page sending status at fueloreder dispatch

Mr. Hot Foods
1 parent 2f2d8a9efe
Showing 6 changed files with 186 additions and 2 deletions Show diff stats
app/partials/accountSetting/accountSetting.Controller.js
app/partials/accountSetting/accountSetting.Service.js
app/partials/accountSetting/accountSetting.html
app/partials/analytics/analytics.controller.js
app/partials/analytics/analytics.html
app/partials/enterFuelOrder/enterFuelOrder.controller.js
@@ -57,6 +57,25 @@
  
             })
           }
+
+            $scope.addAccount = function(){
+              $('#demo-modal').css('display', 'block');
+          }
+
+           $scope.cancelAddAccount = function(){
+              $('#demo-modal').css('display', '');
+          }
+          
+           $scope.createAddAccount = function(){
+              AccountSettingService.addUserProfile(updateData).then(function(result) {
+
+                toastr.success(''+result.success+'', {
+                    closeButton: true
+                })
+              })
+	        
+          }
+          
       }
 })();
  
@@ -75,6 +75,25 @@
           return deferred.promise;
         }
  
+
+        this.addUserProfile = function(data) {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'PUT',
+              url : BASE_URL.url +'/account/updateProfile',
+              headers : {'Content-Type': 'application/x-www-form-urlencoded'},
+              data: data
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+            //console.log(result.data)
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+
     }
  
 })();
 \ No newline at end of file
@@ -4,7 +4,7 @@
          <div class="widget">
             <div class="widget-header">
                <i class="fa fa-user" aria-hidden="true"></i>
-               <h3>Account Sertting</h3>
+               <h3>Account Setting</h3>
             </div>
             <!-- /widget-header -->
             <div class="widget-content">
@@ -55,7 +55,7 @@
                <i class="fa fa-tasks" aria-hidden="true"></i>
                <h3>Additional User Accounts</h3>
                <div class="pull-right">
-                   <button type="submit" style="margin-top: 4px;margin-right: 9px;" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Contact</button>
+                   <button type="submit" style="margin-top: 4px;margin-right: 9px;" ng-click="addAccount()" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Contact</button>
                 </div>
                 <div class="clearfix"></div>
             </div>
@@ -97,3 +97,141 @@
 <!-- /container -->
 <div class="clearfix"></div>
  
+<form class="modal multi-step" id="demo-modal" name="fuelOrderUpdateForm">
+    <div class="modal-dialog modal-m">
+        <div class="modal-content">
+            <div class="modal-body step-1" data-step="1" style="padding: 0;">
+               <div>
+                  <div class="row" style="margin: 0;">
+                     <div>
+                        <div class="widget" style="margin-bottom: 0;">
+                           <div class="widget-header">
+                              <i class="icon-pencil"></i>
+                              <i class="fa fa-user" aria-hidden="true"></i>
+                              <h3>Account Settings</h3>
+                                <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
+                              <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
+                            </div>
+                              <div class="clearfix"></div>
+                           </div>
+                           <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
+                      <div class="col-xs-12">
+                            <div class="col-xs-12">
+                                <h2 style="color:#666;">Additional User Control</h2>
+                            </div>
+                              <div class="clearfix"></div><br>
+
+                               <div class="col-xs-12">
+
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>First Name</b></label>
+                                    </div>
+                                   
+                                    
+                                 </div>
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Last Name</b></label>
+                                    </div>
+                        
+                                    
+                                 </div>
+                                
+                                  </div>
+                             
+                              <br/>
+                             
+                              
+                             <div class="col-xs-12">
+
+                                  <div class="col-md-6">
+                                     <div class="pull-left" style="width: calc(140% - 170px);">
+                                       <input type="text" ng-model="accountdata.fname" placeholder="First Name" class="form-control" >
+                                    </div>
+                                   
+                                    <div class="clearfix"></div>
+                                 </div>
+                                  <div class="col-md-6">
+                                     <div class="pull-left" style="width: calc(140% - 170px);">
+                                       <input type="text" ng-model="accountdata.lname" placeholder="Last Name" class="form-control"  >
+                                    </div>
+                                   
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                               <div class="clearfix"></div>
+                              <br/>
+                             
+                               <div class="col-xs-12">
+                                
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Username</b></label>
+                                    </div>
+                                   
+                                    
+                                 </div>
+                                 <div class="col-md-6">
+                                    <div class="pull-left" style="width: 110px;">
+                                       <label class="new-input-label"><b>Password</b></label>
+                                    </div>
+                        
+                                    
+                                 </div>
+                                
+                                  </div>
+                             
+                              <br/>
+                               <div class="col-xs-12">
+
+                                  <div class="col-md-6">
+                                     <div class="pull-left" style="width: calc(140% - 170px);">
+                                       <input type="text" ng-model="accountdata.uname" placeholder="XYZfbo@gmail.com" class="form-control" >
+                                    </div>
+                                   
+                                    <div class="clearfix"></div>
+                                 </div>
+                                  <div class="col-md-6">
+                                     <div class="pull-left" style="width: calc(140% - 170px);">
+                                       <input type="text" ng-model="accountdata.pwd" placeholder="Password" class="form-control" >
+                                    </div>
+                                   
+                                    <div class="clearfix"></div>
+                                 </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+                                <div class="col-md-6">
+                                <input type="checkbox" id="Weekdays" ng-model="accountdata.fuelMgrAccess" >&nbsp Allow Fuel Manager Access
+                                <br>
+                                <input type="checkbox" id="Weekdays" ng-model="accountdata.fuelMgrAccess" >&nbsp Allow Emailed Price Distribution
+                                </div>
+                              </div>
+                              <div class="clearfix"></div>
+                              <br/>
+                              <div class="col-xs-12">
+
+                              </div>
+                             
+                            
+                           </div>
+                        </div>
+                        
+                     </div>
+                  </div>
+               </div>
+            </div>
+           
+            <div class="modal-footer" style="border-top: 0;">
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="createAddAccount()">Save</button>
+                <button type="button" class="btn btn-default" ng-click="cancelAddAccount()" data-dismiss="modal">Cancel</button>
+           </div>
+        </div>
+    </div>
+</div>
+</form>
+
+                  
 \ No newline at end of file
@@ -218,6 +218,9 @@
             ];
  
  
+            
+
+
     }]);
  
  
@@ -14,6 +14,8 @@
    .subnavbar .mainnav > li:nth-child(3) > a{
    color: #ff9900;
    }
+
+   
 </style>
 <div class="main">
    <div class="container">
@@ -82,6 +82,9 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 			$scope.order.departingDate = new Date($scope.order.departingDate);
 			$scope.order.departingDate = $scope.order.departingDate.getTime();
 		}
+
+		$scope.order.status = 'Pending';
+		
 		console.log($scope.order.quotePrice);
 		var obj =JSON.parse($scope.order.priceQuote);
 		console.log('obj.papMargin',obj.papMargin);
...	...	@@ -57,6 +57,25 @@
57	57
58	58	})
59	59	}
	60	+
	61	+ $scope.addAccount = function(){
	62	+ $('#demo-modal').css('display', 'block');
	63	+ }
	64	+
	65	+ $scope.cancelAddAccount = function(){
	66	+ $('#demo-modal').css('display', '');
	67	+ }
	68	+
	69	+ $scope.createAddAccount = function(){
	70	+ AccountSettingService.addUserProfile(updateData).then(function(result) {
	71	+
	72	+ toastr.success(''+result.success+'', {
	73	+ closeButton: true
	74	+ })
	75	+ })
	76	+
	77	+ }
	78	+
60	79	}
61	80	})();
62	81
...	...
...	...	@@ -75,6 +75,25 @@
75	75	return deferred.promise;
76	76	}
77	77
	78	+
	79	+ this.addUserProfile = function(data) {
	80	+
	81	+ var deferred = $q.defer();
	82	+ $http({
	83	+ method : 'PUT',
	84	+ url : BASE_URL.url +'/account/updateProfile',
	85	+ headers : {'Content-Type': 'application/x-www-form-urlencoded'},
	86	+ data: data
	87	+ })
	88	+ .then(function (result){
	89	+ deferred.resolve(result.data);
	90	+ },function (result){
	91	+ //console.log(result.data)
	92	+ deferred.resolve(result.data);
	93	+ })
	94	+ return deferred.promise;
	95	+ }
	96	+
78	97	}
79	98
80	99	})();
81	100	\ No newline at end of file
...	...
...	...	@@ -4,7 +4,7 @@
4	4	<div class="widget">
5	5	<div class="widget-header">
6	6	<i class="fa fa-user" aria-hidden="true"></i>
7		- <h3>Account Sertting</h3>
	7	+ <h3>Account Setting</h3>
8	8	</div>
9	9	<!-- /widget-header -->
10	10	<div class="widget-content">
...	...	@@ -55,7 +55,7 @@
55	55	<i class="fa fa-tasks" aria-hidden="true"></i>
56	56	<h3>Additional User Accounts</h3>
57	57	<div class="pull-right">
58		- <button type="submit" style="margin-top: 4px;margin-right: 9px;" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Contact</button>
	58	+ <button type="submit" style="margin-top: 4px;margin-right: 9px;" ng-click="addAccount()" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Contact</button>
59	59	</div>
60	60	<div class="clearfix"></div>
61	61	</div>
...	...	@@ -97,3 +97,141 @@
97	97	<!-- /container -->
98	98	<div class="clearfix"></div>
99	99
	100	+<form class="modal multi-step" id="demo-modal" name="fuelOrderUpdateForm">
	101	+ <div class="modal-dialog modal-m">
	102	+ <div class="modal-content">
	103	+ <div class="modal-body step-1" data-step="1" style="padding: 0;">
	104	+ <div>
	105	+ <div class="row" style="margin: 0;">
	106	+ <div>
	107	+ <div class="widget" style="margin-bottom: 0;">
	108	+ <div class="widget-header">
	109	+ <i class="icon-pencil"></i>
	110	+ <i class="fa fa-user" aria-hidden="true"></i>
	111	+ <h3>Account Settings</h3>
	112	+ <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
	113	+ <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
	114	+ </div>
	115	+ <div class="clearfix"></div>
	116	+ </div>
	117	+ <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
	118	+ <div class="col-xs-12">
	119	+ <div class="col-xs-12">
	120	+ <h2 style="color:#666;">Additional User Control</h2>
	121	+ </div>
	122	+ <div class="clearfix"></div><br>
	123	+
	124	+ <div class="col-xs-12">
	125	+
	126	+ <div class="col-md-6">
	127	+ <div class="pull-left" style="width: 110px;">
	128	+ <label class="new-input-label"><b>First Name</b></label>
	129	+ </div>
	130	+
	131	+
	132	+ </div>
	133	+ <div class="col-md-6">
	134	+ <div class="pull-left" style="width: 110px;">
	135	+ <label class="new-input-label"><b>Last Name</b></label>
	136	+ </div>
	137	+
	138	+
	139	+ </div>
	140	+
	141	+ </div>
	142	+
	143	+ <br/>
	144	+
	145	+
	146	+ <div class="col-xs-12">
	147	+
	148	+ <div class="col-md-6">
	149	+ <div class="pull-left" style="width: calc(140% - 170px);">
	150	+ <input type="text" ng-model="accountdata.fname" placeholder="First Name" class="form-control" >
	151	+ </div>
	152	+
	153	+ <div class="clearfix"></div>
	154	+ </div>
	155	+ <div class="col-md-6">
	156	+ <div class="pull-left" style="width: calc(140% - 170px);">
	157	+ <input type="text" ng-model="accountdata.lname" placeholder="Last Name" class="form-control" >
	158	+ </div>
	159	+
	160	+ <div class="clearfix"></div>
	161	+ </div>
	162	+ </div>
	163	+ <div class="clearfix"></div>
	164	+ <br/>
	165	+
	166	+ <div class="col-xs-12">
	167	+
	168	+ <div class="col-md-6">
	169	+ <div class="pull-left" style="width: 110px;">
	170	+ <label class="new-input-label"><b>Username</b></label>
	171	+ </div>
	172	+
	173	+
	174	+ </div>
	175	+ <div class="col-md-6">
	176	+ <div class="pull-left" style="width: 110px;">
	177	+ <label class="new-input-label"><b>Password</b></label>
	178	+ </div>
	179	+
	180	+
	181	+ </div>
	182	+
	183	+ </div>
	184	+
	185	+ <br/>
	186	+ <div class="col-xs-12">
	187	+
	188	+ <div class="col-md-6">
	189	+ <div class="pull-left" style="width: calc(140% - 170px);">
	190	+ <input type="text" ng-model="accountdata.uname" placeholder="XYZfbo@gmail.com" class="form-control" >
	191	+ </div>
	192	+
	193	+ <div class="clearfix"></div>
	194	+ </div>
	195	+ <div class="col-md-6">
	196	+ <div class="pull-left" style="width: calc(140% - 170px);">
	197	+ <input type="text" ng-model="accountdata.pwd" placeholder="Password" class="form-control" >
	198	+ </div>
	199	+
	200	+ <div class="clearfix"></div>
	201	+ </div>
	202	+ </div>
	203	+ <div class="clearfix"></div>
	204	+ <div class="clearfix"></div>
	205	+ <br/>
	206	+ <div class="col-xs-12">
	207	+ <div class="col-md-6">
	208	+ <input type="checkbox" id="Weekdays" ng-model="accountdata.fuelMgrAccess" >&nbsp Allow Fuel Manager Access
	209	+ <br>
	210	+ <input type="checkbox" id="Weekdays" ng-model="accountdata.fuelMgrAccess" >&nbsp Allow Emailed Price Distribution
	211	+ </div>
	212	+ </div>
	213	+ <div class="clearfix"></div>
	214	+ <br/>
	215	+ <div class="col-xs-12">
	216	+
	217	+ </div>
	218	+
	219	+
	220	+ </div>
	221	+ </div>
	222	+
	223	+ </div>
	224	+ </div>
	225	+ </div>
	226	+ </div>
	227	+
	228	+ <div class="modal-footer" style="border-top: 0;">
	229	+ <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="createAddAccount()">Save</button>
	230	+ <button type="button" class="btn btn-default" ng-click="cancelAddAccount()" data-dismiss="modal">Cancel</button>
	231	+ </div>
	232	+ </div>
	233	+ </div>
	234	+</div>
	235	+</form>
	236	+
	237	+
100	238	\ No newline at end of file
...	...
...	...	@@ -218,6 +218,9 @@
218	218	];
219	219
220	220
	221	+
	222	+
	223	+
221	224	}]);
222	225
223	226
...	...
...	...	@@ -14,6 +14,8 @@
14	14	.subnavbar .mainnav > li:nth-child(3) > a{
15	15	color: #ff9900;
16	16	}
	17	+
	18	+
17	19	</style>
18	20	<div class="main">
19	21	<div class="container">
...	...
...	...	@@ -82,6 +82,9 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
82	82	$scope.order.departingDate = new Date($scope.order.departingDate);
83	83	$scope.order.departingDate = $scope.order.departingDate.getTime();
84	84	}
	85	+
	86	+ $scope.order.status = 'Pending';
	87	+
85	88	console.log($scope.order.quotePrice);
86	89	var obj =JSON.parse($scope.order.priceQuote);
87	90	console.log('obj.papMargin',obj.papMargin);
...	...