diff --git a/app/css/custom.css b/app/css/custom.css index 2b9cc5b..4ec2b1c 100644 --- a/app/css/custom.css +++ b/app/css/custom.css @@ -705,4 +705,20 @@ font-size: 10px !important; } .recordCountSelect{ background-color: #fff; +} +.exportBtn{ + margin-top: 20px; +} +.select2-container .select2-choice{ + height: 34px !important; + padding: 6px 12px !important; + border: 1px solid #ccc !important; + background-image: none !important; +} +.select2-container .select2-choice .select2-arrow{ + border-left: none !important; + background: transparent !important; +} +.select2-container .select2-choice{ + padding: 2px 12px !important; } \ No newline at end of file diff --git a/app/index.html b/app/index.html index ef93cfa..e7a8b1b 100644 --- a/app/index.html +++ b/app/index.html @@ -42,6 +42,8 @@ + + @@ -78,6 +80,8 @@ + + @@ -139,6 +143,7 @@ +
@@ -175,6 +180,7 @@ + diff --git a/app/js/app.constant.js b/app/js/app.constant.js index cdda7f3..8521ccf 100644 --- a/app/js/app.constant.js +++ b/app/js/app.constant.js @@ -5,7 +5,7 @@ .constant('BASE_URL', { url: 'http://54.149.169.33:8080/ws' - //url: 'http://192.168.1.175:8080/ws' + //url: 'http://192.168.2.178:8080/ws' //url: 'http://192.168.1.8:8080/ws' }) diff --git a/app/js/app.js b/app/js/app.js index 4174df4..684208e 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -1,7 +1,7 @@ 'use strict'; - angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable']) + angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2']) .config(['$httpProvider', function($httpProvider) { $httpProvider.defaults.withCredentials = true; @@ -240,6 +240,12 @@ controller: "viewVendorContactController" }) + .state("app.enterFuelOrder", { + url: "/enterFuelOrder", + templateUrl: "partials/enterFuelOrder/enterFuelOrder.html", + controller: "enterFuelOrderController" + }) + } ]) diff --git a/app/partials/ContactView/ContactView.html b/app/partials/ContactView/ContactView.html index 4620c5f..111b0d4 100644 --- a/app/partials/ContactView/ContactView.html +++ b/app/partials/ContactView/ContactView.html @@ -61,6 +61,8 @@ + + - +