diff --git a/client/core/src/datePicker/datePicker.html b/client/core/src/datePicker/datePicker.html
index b4cb4c83f..d91f0a53f 100644
--- a/client/core/src/datePicker/datePicker.html
+++ b/client/core/src/datePicker/datePicker.html
@@ -1,19 +1,21 @@
-
+
-
-
+ rule="{{::$ctrl.rule}}"/>
+
+
+ query_builder
+ clear
+
+
\ No newline at end of file
diff --git a/client/core/src/datePicker/datePicker.js b/client/core/src/datePicker/datePicker.js
index bc85c4b06..2ebed10d6 100644
--- a/client/core/src/datePicker/datePicker.js
+++ b/client/core/src/datePicker/datePicker.js
@@ -28,7 +28,8 @@ class DatePicker extends Component {
this._modelView = null;
this._model = undefined;
this._optionsChecked = false;
-
+ this.hasFocus = false;
+ this.hasMouseIn = false;
componentHandler.upgradeElement($element[0].firstChild);
}
@@ -168,7 +169,7 @@ class DatePicker extends Component {
$onInit() {
this.iniOptions = this._getOptions();
-
+ this.isTimePicker = (this.iniOptions && this.iniOptions.enableTime && this.iniOptions.noCalendar);
this.vp = new Flatpickr(this.input, this.iniOptions);
}
$onDestroy() {
diff --git a/client/core/src/datePicker/datePicker.spec.js b/client/core/src/datePicker/datePicker.spec.js
index 4672a71e8..bd0807dd7 100644
--- a/client/core/src/datePicker/datePicker.spec.js
+++ b/client/core/src/datePicker/datePicker.spec.js
@@ -12,12 +12,12 @@ describe('Component vnDatePicker', () => {
angular.mock.module('client');
});
- beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$timeout_) => {
+ beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$timeout_, _$translate_) => {
$componentController = _$componentController_;
$scope = $rootScope.$new();
$timeout = _$timeout_;
$element = angular.element(`
`);
- $translate = {};
+ $translate = _$translate_;
controller = $componentController('vnDatePicker', {$scope, $element, $translate, $timeout});
}));
diff --git a/client/core/src/datePicker/style.scss b/client/core/src/datePicker/style.scss
index f1bd30dab..d729ba947 100644
--- a/client/core/src/datePicker/style.scss
+++ b/client/core/src/datePicker/style.scss
@@ -1,12 +1,18 @@
vn-date-picker {
+ div {
+ outline: none; //remove chrome outline
+ }
.mdl-chip__action {
- position: absolute;
+ position: absolute;
+ width: auto;
top: 0px;
right: -6px;
margin: 22px 0px;
background-color: white;
}
.material-icons {
- font-size: 18px;
+ font-size: 18px;
+ float: right;
+ margin-right: 5px;
}
}
\ No newline at end of file
diff --git a/client/route/routes.json b/client/route/routes.json
index 4980238a9..654761f1a 100644
--- a/client/route/routes.json
+++ b/client/route/routes.json
@@ -34,7 +34,7 @@
"route": "$ctrl.route"
},
"menu": {
- "description": "Datos básicos",
+ "description": "Basic data",
"icon": "person"
}
},
@@ -46,7 +46,7 @@
"route": "$ctrl.route"
},
"menu": {
- "description": "Datos logísticos",
+ "description": "Logistic data",
"icon": "local_shipping"
}
},
@@ -58,7 +58,7 @@
"route": "$ctrl.route"
},
"menu": {
- "description": "Tickets asignados",
+ "description": "Assigned tickets",
"icon": "assignment"
}
}
diff --git a/client/route/src/basic-data/basic-data.html b/client/route/src/basic-data/basic-data.html
index 859633e31..cae7035da 100644
--- a/client/route/src/basic-data/basic-data.html
+++ b/client/route/src/basic-data/basic-data.html
@@ -31,4 +31,7 @@
+
+
+
\ No newline at end of file
diff --git a/client/route/src/card/card.html b/client/route/src/card/card.html
index 985c02d90..1274113e6 100644
--- a/client/route/src/card/card.html
+++ b/client/route/src/card/card.html
@@ -12,7 +12,7 @@
local_shipping
- Ruta {{::$ctrl.route.id}}
+ Route {{::$ctrl.route.id}}
{{$ctrl.route.date | date:'dd/MM/yyyy'}}
diff --git a/client/route/src/locale/es.json b/client/route/src/locale/es.json
index 616431fe5..1c2b2f4c4 100644
--- a/client/route/src/locale/es.json
+++ b/client/route/src/locale/es.json
@@ -1,3 +1,17 @@
{
- "Routes" : "Rutas"
+ "Basic data": "Datos básicos",
+ "Logistic data": "Datos logísticos",
+ "Assigned tickets": "Tickets asignados",
+ "Routes" : "Rutas",
+ "Route" : "Ruta",
+ "Date": "Fecha",
+ "Agency": "Agencia",
+ "Driver": "Conductor",
+ "Vehicle": "Vehículo",
+ "Start Hour" : "Hora Inicio",
+ "End Hour": "Hora Fin",
+ "Start Km": "Km Inicio",
+ "End Km": "Km Fin",
+ "Packages": "Bultos",
+ "Route document": "Documento de Ruta"
}
diff --git a/client/route/src/logistic-data/logistic-data.html b/client/route/src/logistic-data/logistic-data.html
new file mode 100644
index 000000000..5c5a2df55
--- /dev/null
+++ b/client/route/src/logistic-data/logistic-data.html
@@ -0,0 +1,28 @@
+
+
+
\ No newline at end of file
diff --git a/client/route/src/logistic-data/logistic-data.js b/client/route/src/logistic-data/logistic-data.js
new file mode 100644
index 000000000..4230a8282
--- /dev/null
+++ b/client/route/src/logistic-data/logistic-data.js
@@ -0,0 +1,8 @@
+import ngModule from '../module';
+
+ngModule.component('vnRouteLogisticData', {
+ template: require('./logistic-data.html'),
+ bindings: {
+ route: '<'
+ }
+});
diff --git a/client/route/src/route.js b/client/route/src/route.js
index df95ee3da..a9db6db33 100644
--- a/client/route/src/route.js
+++ b/client/route/src/route.js
@@ -6,3 +6,5 @@ import './search-panel/search-panel';
import './create/create';
import './card/card';
import './basic-data/basic-data';
+import './logistic-data/logistic-data';
+import './tickets/tickets';
diff --git a/client/route/src/tickets/tickets.html b/client/route/src/tickets/tickets.html
new file mode 100644
index 000000000..e78e9ab70
--- /dev/null
+++ b/client/route/src/tickets/tickets.html
@@ -0,0 +1,7 @@
+
+
+
+ Assigned tickets
+
+
+
\ No newline at end of file
diff --git a/client/route/src/tickets/tickets.js b/client/route/src/tickets/tickets.js
new file mode 100644
index 000000000..2405d5d9e
--- /dev/null
+++ b/client/route/src/tickets/tickets.js
@@ -0,0 +1,8 @@
+import ngModule from '../module';
+
+ngModule.component('vnRouteTickets', {
+ template: require('./tickets.html'),
+ bindings: {
+ route: '<'
+ }
+});
diff --git a/client/salix/src/components/left-menu/menu-item.html b/client/salix/src/components/left-menu/menu-item.html
index b3315b2fa..6930039f0 100644
--- a/client/salix/src/components/left-menu/menu-item.html
+++ b/client/salix/src/components/left-menu/menu-item.html
@@ -2,6 +2,6 @@
keyboard_arrow_right
{{$ctrl.item.icon}}
- {{$ctrl.item.description}}
+ {{$ctrl.item.description}}
\ No newline at end of file