@@ -695,30 +699,6 @@
-
diff --git a/templates/base_minimal.html.twig b/templates/base_minimal.html.twig
new file mode 100644
index 00000000..8a51bcc6
--- /dev/null
+++ b/templates/base_minimal.html.twig
@@ -0,0 +1,70 @@
+{% import 'menu.html.twig' as menu %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Customers
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig
index af85fd94..cb07b5a3 100644
--- a/templates/customer/form.html.twig
+++ b/templates/customer/form.html.twig
@@ -1,1189 +1,1214 @@
-{% extends 'base.html.twig' %}
-
-{% block body %}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {% if mode == 'update' %} + Edit Customer + {{ obj.getFirstName() ~ ' ' ~ obj.getLastName() }} + {% else %} + New Customer + {% endif %} +
+
-
-
-
-
-
-
- Customers
-
-
-
-
-{% endblock %}
-
-{% block scripts %}
-
-{% endblock %}
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- - {% if mode == 'update' %} - Edit Customer - {{ obj.getFirstName() ~ ' ' ~ obj.getLastName() }} - {% else %} - New Customer - {% endif %} -
-
+
+
+
+
+
+
+ Customers
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
+
diff --git a/templates/geofence/list.html.twig b/templates/geofence/list.html.twig
index 1b9598bc..f8f59a16 100644
--- a/templates/geofence/list.html.twig
+++ b/templates/geofence/list.html.twig
@@ -96,7 +96,10 @@ initMap();
function initMap() {
var map = new google.maps.Map(document.getElementById('m_gmap'),
{
- center: {lat: 14.6091, lng: 121.0223},
+ center: {
+ lat: {% trans %}default_lat{% endtrans %},
+ lng: {% trans %}default_long{% endtrans %},
+ },
mapTypeId: 'roadmap',
zoom: 13
});
diff --git a/templates/home.html.twig b/templates/home.html.twig
index 2907f228..b7ac2c24 100644
--- a/templates/home.html.twig
+++ b/templates/home.html.twig
@@ -1,32 +1,94 @@
{% extends 'base.html.twig' %}
-{% block body %}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {% if mode == 'update' %} + Edit Customer + {{ obj.getFirstName() ~ ' ' ~ obj.getLastName() }} + {% else %} + New Customer + {% endif %} +
+
-
-
-
-
-
-
- - Dashboard -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{% block stylesheets %}
+
+{% endblock %}
+
+{% block body %}
+
+
+
+{% endblock %}
+
+
+{% block scripts %}
+
+
+
+{% if dashboard_enable == 'true' %}
+ {{ include('map/' ~ map_js_file) }}
+{% endif %}
+
{% endblock %}
diff --git a/templates/hub/form.html.twig b/templates/hub/form.html.twig
index bb943166..df8a7190 100644
--- a/templates/hub/form.html.twig
+++ b/templates/hub/form.html.twig
@@ -164,12 +164,34 @@
{% block scripts %}
-
+
+
+
+
+{% endblock %}
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
new file mode 100644
index 00000000..e0714676
--- /dev/null
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -0,0 +1,1607 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+{{ include('map/' ~ map_js_file) }}
+
+
+
+
+{% endblock %}
+
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 1914dfe9..a0e5985c 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -1,1674 +1,1771 @@
-{% extends 'base.html.twig' %}
-
-{% block body %}
-
-
+
+
+
+
+
+
+
+
+
+
+ + One-step Job Order +
+
-
-
-
-
-
-
- Job Order
-
-
-
-
- {% if mode in ['update-processing', 'update-reassign-hub'] %}
-
-
- {% endif %}
-{% endblock %}
-
-{% block scripts %}
-
-
-
-
-
-{% endblock %}
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- - {% if mode == 'update-processing' %} - Dispatch - {{ obj.getID() }} - {% elseif mode == 'update-assigning' %} - Rider Assignment - {{ obj.getID() }} - {% elseif mode == 'update-reassign-hub' %} - Re-assign Hub - {{ obj.getID() }} - {% elseif mode == 'update-reassign-rider' %} - Re-assign Rider - {{ obj.getID() }} - {% elseif mode == 'update-all' %} - Viewing - {{ obj.getID() }} - {% else %} - Incoming - {% endif %} -
-
+
+
+
+
+
+
+ Job Order
+
+
+
+
+ {% if mode in ['update-processing', 'update-reassign-hub'] %}
+
+
+ {% endif %}
+{% endblock %}
+
+{% block scripts %}
+{{ include('map/' ~ map_js_file) }}
+
+
+
+
+{% endblock %}
+
diff --git a/templates/job-order/form.onestep.html.twig b/templates/job-order/form.onestep.html.twig
new file mode 100644
index 00000000..8e4ac45d
--- /dev/null
+++ b/templates/job-order/form.onestep.html.twig
@@ -0,0 +1,1514 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {% if mode == 'update-processing' %} + Dispatch + {{ obj.getID() }} + {% elseif mode == 'update-assigning' %} + Rider Assignment + {{ obj.getID() }} + {% elseif mode == 'update-reassign-hub' %} + Re-assign Hub + {{ obj.getID() }} + {% elseif mode == 'update-reassign-rider' %} + Re-assign Rider + {{ obj.getID() }} + {% elseif mode == 'update-all' %} + Viewing + {{ obj.getID() }} + {% else %} + Incoming + {% endif %} +
+
+
+
@@ -651,8 +651,8 @@ $(function() {
var map = new GMaps({
div: '#m_gmap',
- lat: 14.6091,
- lng: 121.0223,
+ lat: {% trans %}default_lat{% endtrans %},
+ lng: {% trans %}default_long{% endtrans %},
click: function(e) {
// handle click in map
selectPoint(map, e.latLng);
diff --git a/templates/job-order/list.all.html.twig b/templates/job-order/list.all.html.twig
index a4cd4afe..01ff98d5 100644
--- a/templates/job-order/list.all.html.twig
+++ b/templates/job-order/list.all.html.twig
@@ -19,21 +19,44 @@
@@ -45,93 +68,119 @@
{% endblock %}
{% block scripts %}
-
+ // auto refresh table
+ setInterval(function() {
+ table.reload();
+ }, {{ table_refresh_rate }});
+
+ $("#rider_list").on("change", function() {
+ table.search($(this).val(), "rider");
+ });
+
+ $("#date_start").on("change", function() {
+ var date_start = $(this).val();
+ var date_end = $("[name='date_end']").val();
+ var date_array = [date_start, date_end];
+
+ table.search(date_array, "schedule_date");
+ });
+
+ $("#date_end").on("change", function() {
+ console.log($(this).val());
+
+ var date_end = $(this).val();
+ var date_start = $("[name='date_start']").val();
+ var date_array = [date_start, date_end];
+
+ table.search(date_array, "schedule_date");
+ });
+ });
+
{% endblock %}
diff --git a/templates/job-order/list.fulfillment.html.twig b/templates/job-order/list.fulfillment.html.twig
index f38bd4a5..8115866d 100644
--- a/templates/job-order/list.fulfillment.html.twig
+++ b/templates/job-order/list.fulfillment.html.twig
@@ -19,21 +19,44 @@
@@ -45,88 +68,116 @@
{% endblock %}
{% block scripts %}
-
+ // auto refresh table
+ setInterval(function() {
+ table.reload();
+ }, {{ table_refresh_rate }});
+
+
+ $("#rider_list").on("change", function() {
+ console.log($(this).val());
+ table.search($(this).val(), "rider");
+ });
+
+ $("#date_start").on("change", function() {
+ var date_start = $(this).val();
+ var date_end = $("[name='date_end']").val();
+ var date_array = [date_start, date_end];
+
+ table.search(date_array, "schedule_date");
+ });
+
+ $("#date_end").on("change", function() {
+ console.log($(this).val());
+
+ var date_end = $(this).val();
+ var date_start = $("[name='date_start']").val();
+ var date_array = [date_start, date_end];
+
+ table.search(date_array, "schedule_date");
+ });
+ });
+
{% endblock %}
diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig
index cea8df51..451d8492 100644
--- a/templates/job-order/list.open.html.twig
+++ b/templates/job-order/list.open.html.twig
@@ -19,21 +19,44 @@
@@ -45,101 +68,129 @@
{% endblock %}
{% block scripts %}
-
+ // auto refresh table
+ setInterval(function() {
+ table.reload();
+ }, {{ table_refresh_rate }});
+
+ $("#rider_list").on("change", function() {
+ table.search($(this).val(), "rider");
+ });
+
+ $("#date_start").on("change", function() {
+ var date_start = $(this).val();
+ var date_end = $("[name='date_end']").val();
+ var date_array = [date_start, date_end];
+
+ table.search(date_array, "schedule_date");
+ });
+
+ $("#date_end").on("change", function() {
+ console.log($(this).val());
+
+ var date_end = $(this).val();
+ var date_start = $("[name='date_start']").val();
+ var date_array = [date_start, date_end];
+
+ table.search(date_array, "schedule_date");
+ });
+ });
+
{% endblock %}
diff --git a/templates/job-order/popup.html.twig b/templates/job-order/popup.html.twig
new file mode 100644
index 00000000..d4e67d48
--- /dev/null
+++ b/templates/job-order/popup.html.twig
@@ -0,0 +1,13 @@
+{% set cust = jo.getCustomer %}
+{% set cv = jo.getCustomerVehicle %}
+{{ cust.getNameDisplay }}
+{{ cv.getPlateNumber }}
+Job Order #{{ jo.getID }}
+{{ jo.getServiceTypeName }}
+{{ jo.getStatusText }} +{% if jo.getRider != null %} +
+{% set rider = jo.getRider %} +{{ rider.getFullName }}
+{{ rider.getPlateNumber }} +{% endif %} diff --git a/templates/job-order/tracker.html.twig b/templates/job-order/tracker.html.twig new file mode 100644 index 00000000..661bcc64 --- /dev/null +++ b/templates/job-order/tracker.html.twig @@ -0,0 +1,118 @@ +{% extends 'base_minimal.html.twig' %} + +{% block body %} + +
+
+{% endblock %}
+
+{% block scripts %}
+{{ include('map/' ~ map_js_file) }}
+
+
+
+
+{% endblock %}
+
diff --git a/templates/job-order/form.pdf.html.twig b/templates/job-order/form.pdf.html.twig
index 5499f1fb..4602b6e6 100644
--- a/templates/job-order/form.pdf.html.twig
+++ b/templates/job-order/form.pdf.html.twig
@@ -221,7 +221,7 @@
+
+
+
+
+
+
+
+
+
+
+ + One-step Job Order +
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +{{ cv.getPlateNumber }}
+Job Order #{{ jo.getID }}
+{{ jo.getServiceTypeName }}
+{{ jo.getStatusText }} +{% if jo.getRider != null %} +
+{% set rider = jo.getRider %} +{{ rider.getFullName }}
+{{ rider.getPlateNumber }} +{% endif %} diff --git a/templates/job-order/tracker.html.twig b/templates/job-order/tracker.html.twig new file mode 100644 index 00000000..661bcc64 --- /dev/null +++ b/templates/job-order/tracker.html.twig @@ -0,0 +1,118 @@ +{% extends 'base_minimal.html.twig' %} + +{% block body %} + +
+
+{% endblock %}
+
+{% block scripts %}
+
+
+
+{{ include('map/' ~ map_js_file) }}
+
+{% endblock %}
diff --git a/templates/map/initBingMap.js b/templates/map/initBingMap.js
new file mode 100644
index 00000000..0183fe54
--- /dev/null
+++ b/templates/map/initBingMap.js
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/templates/map/initGoogleMap.js b/templates/map/initGoogleMap.js
new file mode 100644
index 00000000..51349ae2
--- /dev/null
+++ b/templates/map/initGoogleMap.js
@@ -0,0 +1,22 @@
+
+
+
diff --git a/templates/map/initOpenStreetMap.js b/templates/map/initOpenStreetMap.js
new file mode 100644
index 00000000..8eab44bd
--- /dev/null
+++ b/templates/map/initOpenStreetMap.js
@@ -0,0 +1,4 @@
+
diff --git a/templates/map/joOpenStreetMap.js b/templates/map/joOpenStreetMap.js
new file mode 100644
index 00000000..3d92c330
--- /dev/null
+++ b/templates/map/joOpenStreetMap.js
@@ -0,0 +1,26 @@
+
+
+
diff --git a/templates/outlet/form.html.twig b/templates/outlet/form.html.twig
index b5abfd4b..89f94857 100644
--- a/templates/outlet/form.html.twig
+++ b/templates/outlet/form.html.twig
@@ -143,12 +143,34 @@
{% block scripts %}
-
+
+
+
+
+
+
+
+
+ 
+
+
+
+ Order #{{ jo.getID }}
+ {{ rider.getFullName }}
+ {{ service_type }}
+