hide attachement, solved issue of pie chart and calender starts from monday

Rishav Singla
1 parent 7f6e3b1df9
Showing 3 changed files with 5 additions and 3 deletions Show diff stats
app/partials/analytics/analytics.controller.js
app/partials/fuelOrders/fuelOrders.html
app/partials/scheduler/scheduler.controller.js
@@ -248,6 +248,7 @@ angular.module(&#39;acufuel&#39;)
                         y: function(d) {
                             return d.y;
                         },
+                        valueFormat: d3.format(".0f"),
                         showLabels: false,
                         segmentShowStroke: false,
                         animationSteps: 20,
@@ -95,7 +95,7 @@
                              <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)">
                               {{row.companyName}}
                              </td>
-                             <td data-title="'Fueling Date'" filter="{fuelingDate: 'text'}" sortable="'fuelingDate'" ng-click="editTableRow(row)">
+                             <td data-title="'Fueling Date'" filter="{'fuelingDate': 'text'}" sortable="'fuelingDate'" ng-click="editTableRow(row)">
                               {{row.fuelingDate |date:'MM/dd/yyyy'}}
                              </td>
                              <td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)">
@@ -129,7 +129,7 @@
                                     </select>
  
                              </td>
-                             <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
+                             <!-- <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
                                     <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" >
                                         <option value="" disabled selected="selected" >Invoice</option>
                                         <option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option>
@@ -138,7 +138,7 @@
                                         <option value="uploadAttachment" >Upload</option>
                                     </select>
                                     <i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i>
-                             </td>
+                             </td> -->
                            </tr>
                          </table>
  
@@ -204,6 +204,7 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
  
   $scope.uiConfig = {
     calendar:{
+      firstDay:1,
       height: 450,
       editable: true,
       droppable: true,
...	...	@@ -248,6 +248,7 @@ angular.module('acufuel')
248	248	y: function(d) {
249	249	return d.y;
250	250	},
	251	+ valueFormat: d3.format(".0f"),
251	252	showLabels: false,
252	253	segmentShowStroke: false,
253	254	animationSteps: 20,
...	...
...	...	@@ -95,7 +95,7 @@
95	95	<td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)">
96	96	{{row.companyName}}
97	97	</td>
98		- <td data-title="'Fueling Date'" filter="{fuelingDate: 'text'}" sortable="'fuelingDate'" ng-click="editTableRow(row)">
	98	+ <td data-title="'Fueling Date'" filter="{'fuelingDate': 'text'}" sortable="'fuelingDate'" ng-click="editTableRow(row)">
99	99	{{row.fuelingDate \|date:'MM/dd/yyyy'}}
100	100	</td>
101	101	<td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)">
...	...	@@ -129,7 +129,7 @@
129	129	</select>
130	130
131	131	</td>
132		- <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
	132	+ <!-- <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
133	133	<select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" >
134	134	<option value="" disabled selected="selected" >Invoice</option>
135	135	<option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option>
...	...	@@ -138,7 +138,7 @@
138	138	<option value="uploadAttachment" >Upload</option>
139	139	</select>
140	140	<i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i>
141		- </td>
	141	+ </td> -->
142	142	</tr>
143	143	</table>
144	144
...	...
...	...	@@ -204,6 +204,7 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
204	204
205	205	$scope.uiConfig = {
206	206	calendar:{
	207	+ firstDay:1,
207	208	height: 450,
208	209	editable: true,
209	210	droppable: true,
...	...