- {$arr->vehicle->type} |
- {$arr->vehicle->company} |
+ {*$arr->vehicle->type*} |
+ {*$arr->vehicle->company*} |
- {$data=explode("/",$arr->vehicle->driver)}
- {implode(" ",$data)}
+ {*$data=explode("/",$arr->vehicle->driver)}
+ {implode(" ",$data)*}
|
- {$data=explode("/",$arr->vehicle->telephone)}
- {implode(" ",$data)}
+ {*$data=explode("/",$arr->vehicle->telephone)}
+ {implode(" ",$data)*}
|
- {$data=explode("/",$arr->vehicle->indentity_card)}
- {implode(" ",$data)}
+ {*$data=explode("/",$arr->vehicle->indentity_card)}
+ {implode(" ",$data)*}
|
@@ -77,10 +74,10 @@
{/if}
|
- {$arr->vehicle->plate} |
+ {$arr->plate} |
{if $arr->time_in}
-
+
{/if}
|
@@ -90,7 +87,7 @@
|
{if $arr->time_out}
-
+
{/if}
|
diff --git a/web/js/dashboard.js b/web/js/dashboard.js
index ab134283..0391d7fb 100644
--- a/web/js/dashboard.js
+++ b/web/js/dashboard.js
@@ -58,31 +58,31 @@ function renderNewLogs(data) {
var imageOut = "";
var timeOut = "";
if (data.type == "in") {
- imageIn = ` `;
+ imageIn = ` `;
timeIn = formatTime(data.time);
$("#totals-in").html(parseInt($("#totals-in").html()) + 1);
}
if (data.type == "out") {
if (data.logs) {
- imageIn = ` `;
+ imageIn = ` `;
timeIn = formatTime(data.logs.time_in);
} else {
imageIn = "";
timeIn = "";
}
- imageOut = ` `;
+ imageOut = ` `;
timeOut = formatTime(data.time);
$("#totals-out").html(parseInt($("#totals-out").html()) + 1);
}
- var driver = data.vehicleInfo.driver.split("/");
- var telephone = data.vehicleInfo.telephone.split("/");
- var cmt = data.vehicleInfo.indentity_card.split("/");
+// var driver = data.vehicleInfo.driver.split("/");
+// var telephone = data.vehicleInfo.telephone.split("/");
+// var cmt = data.vehicleInfo.indentity_card.split("/");
var html = ` |
- ` + data.vehicleInfo.type + ` |
- ` + data.vehicleInfo.company + ` |
- ` + driver.join(" ") + ` |
- ` + telephone.join(" ") + ` |
- ` + cmt.join(" ") + ` |
+ |
+ |
+ |
+ |
+ |
không có
@@ -93,7 +93,7 @@ function renderNewLogs(data) {
không có
|
- ` + data.vehicleInfo.plate + ` |
+ ` + data.plate + ` |
` + imageIn + ` |
` + timeIn + ` |
` + imageOut + ` |