viithiisys / Acufuel

Download as
Browse Code ยป

Commit e95d89b77f5b51cf5ec5ec8c74bfc65bd6c5fdbb

Authored by Swarn Singh
1 parent a55ef20b57
Exists in master

integrate editor on update fuel manager page, fix enter fuel order page

Showing 8 changed files with 126 additions and 76 deletions   Show diff stats
... ... @@ -44,11 +44,18 @@
44 44 <link rel="stylesheet" type="text/css" href="css/ngTable.css">
45 45 <link rel="stylesheet" href="bower_components/select2/select2.css">
46 46  
47   - <link rel="stylesheet" type="text/css" href="css/fullcalender.css">
48   - <link rel="stylesheet" type="text/css" href="css/fullcalenderprint.css">
  47 + <!-- <link rel="stylesheet" type="text/css" href="css/fullcalender.css">
  48 + <link rel="stylesheet" type="text/css" href="css/fullcalenderprint.css"> -->
49 49  
50 50 <!-- <link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css"> -->
51 51  
  52 + <!-- <link href='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.min.css' rel='stylesheet' />
  53 + <link href='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.print.min.css' rel='stylesheet' media='print' />
  54 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/moment.min.js'></script>
  55 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/jquery.min.js'></script>
  56 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/jquery-ui.min.js'></script> -->
  57 +
  58 +
52 59 </head>
53 60 <body>
54 61 <!-- views -->
... ... @@ -86,7 +93,7 @@
86 93 <script src="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.js"></script>
87 94 <script src="bower_components/select2/select2.js"></script>
88 95 <script src="bower_components/angular-ui-select2/src/select2.js"></script>
89   -
  96 + <script src="bower_components/angular-ckeditor/angular-ckeditor.js"></script>
90 97  
91 98 <!-- <script src="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.js"></script> -->
92 99  
... ... @@ -112,7 +119,7 @@
112 119  
113 120 <script src="js/ngTable.js"></script>
114 121  
115   - <script src="js/fullcalender.js"></script>
  122 + <!-- <script src="js/fullcalender.js"></script> -->
116 123  
117 124 <script src="http://cdn.ckeditor.com/4.6.1/standard-all/ckeditor.js"></script>
118 125 <script src="https://code.highcharts.com/maps/highmaps.js"></script>
... ... @@ -190,7 +197,7 @@
190 197 <script src="partials/enterFuelOrder/enterFuelOrder.service.js"></script>
191 198  
192 199 <script src="partials/main/main.service.js"></script>
193   -
  200 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.min.js'></script>
194 201  
195 202 </body>
196 203 </html>
197 204 \ No newline at end of file
... ...
1 1 'use strict';
2 2  
3 3  
4   - angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2'])
  4 + angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor'])
5 5  
6 6 .config(['$httpProvider', function($httpProvider) {
7 7 $httpProvider.defaults.withCredentials = true;
... ...
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @e95d89b
... ... @@ -16,7 +16,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
16 16  
17 17 $scope.order = {};
18 18 $scope.dispatchOrder = {};
19   - $scope.dispatchOrder.fuelOrderObj = [];
  19 + $scope.dispatchOrder.fuelOrderList = [];
20 20 $scope.order.upliftDate = '';
21 21 $scope.order.departingDate = '';
22 22 $scope.selectedCompanyName = '';
... ... @@ -54,6 +54,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
54 54 }
55 55  
56 56 $scope.dispatchFuel = function(){
  57 + $scope.showLoader = true;
57 58 $scope.order.companyId = $scope.selectedCompanyId;
58 59 if ($scope.order.upliftDate != '') {
59 60 $scope.order.upliftDate = new Date($scope.order.upliftDate);
... ... @@ -63,10 +64,15 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
63 64 $scope.order.departingDate = new Date($scope.order.departingDate);
64 65 $scope.order.departingDate = $scope.order.departingDate.getTime();
65 66 }
66   - $scope.dispatchOrder.fuelOrderObj.push($scope.order);
  67 + $scope.dispatchOrder.fuelOrderList.push($scope.order);
67 68 console.log('$scope.order', $scope.dispatchOrder);
68 69 enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
69 70 console.log('result', result);
  71 + $scope.showLoader = false;
  72 + $scope.order = {};
  73 + toastr.success('Fuel Order Dispatched Successfully', {
  74 + closeButton: true
  75 + })
70 76 })
71 77 }
72 78  
... ...
app/partials/scheduler/scheduler.controller.js
Diff comments   View file @e95d89b
... ... @@ -6,10 +6,9 @@ angular.module(&#39;acufuel&#39;)
6 6 .controller('schedulerController', ['$scope', function($scope) {
7 7  
8 8 $scope.test = "Testing...";
9   -
10   - $(document).ready(function() {
  9 +
11 10  
12   - $('#calendar').fullCalendar({
  11 + /*$('#calendar').fullCalendar({
13 12 header: {
14 13 left: 'prev,next today',
15 14 center: 'title',
... ... @@ -76,7 +75,7 @@ angular.module(&#39;acufuel&#39;)
76 75 ]
77 76 });
78 77  
79   - });
  78 + });*/
80 79  
81 80  
82 81 }]);
... ...
app/partials/scheduler/scheduler.html
Diff comments   View file @e95d89b
... ... @@ -18,72 +18,76 @@
18 18 color: #fff;
19 19 background-color: #ff9900;
20 20 }
  21 +
  22 +
  23 + /*#wrap {
  24 + width: 1100px;
  25 + margin: 0 auto;
  26 + }
  27 +
  28 + #external-events {
  29 + float: left;
  30 + width: 150px;
  31 + padding: 0 10px;
  32 + border: 1px solid #ccc;
  33 + background: #eee;
  34 + text-align: left;
  35 + }
  36 +
  37 + #external-events h4 {
  38 + font-size: 16px;
  39 + margin-top: 0;
  40 + padding-top: 1em;
  41 + }
  42 +
  43 + #external-events .fc-event {
  44 + margin: 10px 0;
  45 + cursor: pointer;
  46 + }
  47 +
  48 + #external-events p {
  49 + margin: 1.5em 0;
  50 + font-size: 11px;
  51 + color: #666;
  52 + }
  53 +
  54 + #external-events p input {
  55 + margin: 0;
  56 + vertical-align: middle;
  57 + }
  58 +
  59 + #calendar {
  60 + float: right;
  61 + width: 900px;
  62 + }*/
21 63 </style>
22 64 <div class="main">
23 65 <div class="container">
24 66 <div class="row">
25   - <div class="col-md-3 col-xs-12">
26   - <div class="widget stacked">
27   - <div class="widget-header">
28   - <i class="fa fa-plane"></i>
29   - <h3>Entry Support Service</h3>
30   - </div>
31   - <!-- /widget-header -->
32   - <div class="widget-content">
33   - <div id='external-events'>
34   - <h6>Drag a event and drop into callender</h6>
35   - <ul style="list-style: none;padding: 0px">
36   - <li class="active">
37   - <div class='fc-event newUlView'>My Event 1</div>
38   - </li>
39   - <li class="active">
40   - <div class='fc-event newUlView' >My Event 2</div>
41   - </li>
42   - <li class="active">
43   - <div class='fc-event newUlView'>My Event 3</div>
44   - </li>
45   - <li class="active">
46   - <div class='fc-event newUlView'>My Event 4</div>
47   - </li>
48   - <li class="active">
49   - <div class='fc-event newUlView'>My Event 5</div>
50   - </li>
51   - <li class="active">
52   - <div class='fc-event newUlView'>My Event 6</div>
53   - </li>
54   - </ul>
55   - </div>
56   - <button type="reset" style="margin-left: 145px;" class="btn btn-default btn-default-bottom"> Add Event</button>
57   - </div>
58   - <!-- /widget-content -->
59   - </div>
60   - <!-- /widget -->
61   - </div>
62   - <!-- /span6 -->
  67 + <div class="col-xs-12">
  68 + <!-- <div id='wrap'>
  69 +
  70 + <div id='external-events'>
  71 + <h4>Draggable Events</h4>
  72 + <div class='fc-event'>My Event 1</div>
  73 + <div class='fc-event'>My Event 2</div>
  74 + <div class='fc-event'>My Event 3</div>
  75 + <div class='fc-event'>My Event 4</div>
  76 + <div class='fc-event'>My Event 5</div>
  77 + <p>
  78 + <input type='checkbox' id='drop-remove' />
  79 + <label for='drop-remove'>remove after drop</label>
  80 + </p>
  81 + </div>
  82 +
  83 + <div id='calendar'></div>
  84 +
  85 + <div style='clear:both'></div>
63 86  
64   - <div class="col-md-9">
65   - <div class="widget stacked">
66   - <div class="widget-header">
67   - <i class="fa fa-calendar"></i>
68   - <h3>Schedule</h3>
69   - </div>
70   - <!-- /widget-header -->
71   - <div class="widget-content">
72   - <!-- <div class="btn-group">
73   - <button class="btn btn-success" ng-click="changeView('agendaDay', 'myCalendar1')">AgendaDay</button>
74   - <button class="btn btn-success" ng-click="changeView('agendaWeek', 'myCalendar1')">AgendaWeek</button>
75   - <button class="btn btn-success" ng-click="changeView('month', 'myCalendar1')">Month</button>
76   - </div>
77   - <div ui-calendar="uiConfig.calendar" class="span8 calendar" ng-model="eventSources"></div> -->
78   - <div id='calendar'></div>
  87 + </div> -->
79 88  
80   - <div style='clear:both'></div>
81   - </div>
82   - <!-- /widget-content -->
83   - </div>
84   - <!-- /widget -->
  89 +
85 90 </div>
86   - <!-- /span6 -->
87 91  
88 92 </div>
89 93 <!-- /row -->
... ...
app/partials/updateFuelManager/updateFuelManager.controller.js
Diff comments   View file @e95d89b
... ... @@ -17,6 +17,17 @@
17 17 })
18 18 }
19 19  
  20 + $scope.options = {
  21 + language: 'en',
  22 + allowedContent: true,
  23 + entities: false
  24 + };
  25 +
  26 + // Called when the editor is completely ready.
  27 + $scope.onReady = function () {
  28 + // ...
  29 + };
  30 +
20 31 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
21 32  
22 33 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
... ... @@ -241,6 +252,22 @@
241 252  
242 253 }
243 254  
  255 + $scope.closeAccordian = function(jets){
  256 + $('.'+jets.id).slideUp();
  257 + $('#'+jets.id).removeClass('customActive');
  258 + $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
  259 + $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
  260 + $('#'+jets.id+' .btn-default').css('display', 'inline-block');
  261 + }
  262 +
  263 + $scope.closeAccordianVtype = function(jets){
  264 + $('.'+jets.id).slideUp();
  265 + $('#'+jets.id).removeClass('customActive');
  266 + $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
  267 + $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
  268 + $('#'+jets.id+' .btn-default').css('display', 'inline-block');
  269 + }
  270 +
244 271 $scope.saveVtypeJetAccordian = function(jets){
245 272 $scope.showLoader = true;
246 273 $scope.jetsDetail = jets;
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @e95d89b
... ... @@ -92,6 +92,7 @@
92 92 <span style="margin-right: 0;">$</span>
93 93 <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
94 94 <div class="pull-right">
  95 + <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordian(jets)">Close</button>
95 96 <button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button>
96 97 <button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button>
97 98 <button class="btn btn-default" ng-click="toggleJestAccordian(jets.id, $index)">Edit</button>
... ... @@ -147,7 +148,9 @@
147 148 </div>
148 149 </div> -->
149 150 <div class="clearfix"></div>
150   - <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea>
  151 + <!-- <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea> -->
  152 + <br/>
  153 + <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div>
151 154 </div>
152 155 </div>
153 156 </div>
... ... @@ -248,6 +251,7 @@
248 251 <span style="margin-right: 0;">$</span>
249 252 <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
250 253 <div class="pull-right">
  254 + <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordianVtype(jets)">Close</button>
251 255 <button class="btn btn-success" style="display: none;" ng-click="saveVtypeJetAccordian(jets)">Save</button>
252 256 <button class="btn btn-danger" style="display: none;" ng-click="deleteVtypeJetAccordian(jets.id)">Delete</button>
253 257 <button class="btn btn-default" ng-click="toggleVtypeJestAccordian(jets.id, $index)">Edit</button>
... ... @@ -303,7 +307,8 @@
303 307 </div>
304 308 </div> -->
305 309 <div class="clearfix"></div>
306   - <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea>
  310 + <br/>
  311 + <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div>
307 312 </div>
308 313 </div>
309 314 </div>
... ... @@ -357,7 +362,7 @@
357 362 <div class="clearfix"></div>
358 363 </div>
359 364 <div class="customAccordianTabBody">
360   - <textarea class="form-control resizeTextarea" ng-model="newJet.message" placeholder="Message..."></textarea>
  365 + <div ckeditor="options" ng-model="newJet.message" ready="onReady()"></div>
361 366 </div>
362 367  
363 368 </div>
... ... @@ -397,7 +402,7 @@
397 402 <div class="clearfix"></div>
398 403 </div>
399 404 <div class="customAccordianTabBody">
400   - <textarea class="form-control resizeTextarea" ng-model="newVtypeJet.message" placeholder="Message..."></textarea>
  405 + <div ckeditor="options" ng-model="newVtypeJet.message" ready="onReady()"></div>
401 406 </div>
402 407  
403 408 </div>
... ...
... ... @@ -34,6 +34,8 @@
34 34 "angular-resource": "~1.6.4",
35 35 "angular-xeditable": "~0.7.1",
36 36 "angular-bootstrap-toggle": "~0.1.2",
37   - "angular-ui-select2": "^0.0.5"
  37 + "angular-ui-select2": "^0.0.5",
  38 + "angular-ckeditor": "^1.0.3",
  39 + "angular-ui-calendar": "^1.0.2"
38 40 }
39 41 }
... ...