diff --git a/plugins/romanah/gokbakja/components/MachineProduction.php b/plugins/romanah/gokbakja/components/MachineProduction.php
index e691d41..f8809d8 100644
--- a/plugins/romanah/gokbakja/components/MachineProduction.php
+++ b/plugins/romanah/gokbakja/components/MachineProduction.php
@@ -302,7 +302,7 @@ class MachineProduction extends ComponentBase
| ' . $machineProductions[$x]->width . ' |
' . $machineProductions[$x]->gram . ' |
' . $machineProductions[$x]->bag_type->name . ' |
- ' . ($machineProductions[$x]->color->name ?? "") . ' |
+ ' . ($machineProductions[$x]->color->name ?? "") . ', '. $machineProductions[$x]->layer .' gat |
' . number_format($machineProductions[$x]->produced_weight, 2) . ' kg
|
@@ -340,9 +340,13 @@ class MachineProduction extends ComponentBase
$start = Carbon::parse($data["start"])->format('Y-m-d');
$end = Carbon::parse($data["end"])->format('Y-m-d');
$machine = $data["machine_id"];
- $mechanic = $data["mechanic_id"];
- $size = $data["size_id"];
+ // $mechanic = $data["mechanic_id"];
$type = $data["type_id"];
+
+ $width = $data["width"];
+ $employee_name = $data["employee_name"];
+ $gram = $data["gram"];
+ $layer = $data["layer"];
// $is_finished = $data["is_finished"];
@@ -350,19 +354,34 @@ class MachineProduction extends ComponentBase
// $machineProductions->where("is_finished", (bool) $is_finished);
// }
+ if ($employee_name) {
+ $machineProductions->where("employee_name", "like", "%" . $employee_name . "%");
+ $machineProductionsCalc->where("employee_name", "like", "%" . $employee_name . "%");
+ }
+
if ($machine) {
$machineProductions->where("machine_id", $machine);
$machineProductionsCalc->where("machine_id", $machine);
}
- if ($mechanic) {
- $machineProductions->where("mechanic_id", $mechanic);
- $machineProductionsCalc->where("mechanic_id", $mechanic);
+ // if ($mechanic) {
+ // $machineProductions->where("mechanic_id", $mechanic);
+ // $machineProductionsCalc->where("mechanic_id", $mechanic);
+ // }
+
+ if ($width) {
+ $machineProductions->where("width", $width);
+ $machineProductionsCalc->where("width", $width);
}
- if ($size) {
- $machineProductions->where("size_id", $size);
- $machineProductionsCalc->where("size_id", $size);
+ if ($layer) {
+ $machineProductions->where("layer", $layer);
+ $machineProductionsCalc->where("layer", $layer);
+ }
+
+ if ($gram) {
+ $machineProductions->where("gram", $gram);
+ $machineProductionsCalc->where("gram", $gram);
}
if ($type) {
@@ -391,11 +410,11 @@ class MachineProduction extends ComponentBase
data-request-data="machineProdId: ' . $machineProductionsFiltered[$x]->id . '"
data-bs-toggle="modal" data-bs-target=".bs-example-modal-lg" style="color: darkblue;"> #Rulon' . ($machineProductionsFiltered[$x]->id) . '
' . ($machineProductionsFiltered[$x]->date == null ? "" : Carbon::parse($machineProductionsFiltered[$x]->date)->format('d.m.Y')) . ' |
- ' . $machineProductionsFiltered[$x]->building_name . ' |
' . $machineProductionsFiltered[$x]->machine->name . ' |
- ' . $machineProductionsFiltered[$x]->bag_size->name . ' |
+ ' . $machineProductionsFiltered[$x]->width . ' |
+ ' . $machineProductionsFiltered[$x]->gram . ' |
' . $machineProductionsFiltered[$x]->bag_type->name . ' |
- ' . ($machineProductionsFiltered[$x]->color->name ?? "") . ' |
+ ' . ($machineProductionsFiltered[$x]->color->name ?? "") . ', '. $machineProductionsFiltered[$x]->layer .' gat |
' . number_format($machineProductionsFiltered[$x]->produced_weight, 2) . ' kg
|
diff --git a/themes/gokbakja/meta/menus/aside.yaml b/themes/gokbakja/meta/menus/aside.yaml
index 511a15a..cdbc007 100644
--- a/themes/gokbakja/meta/menus/aside.yaml
+++ b/themes/gokbakja/meta/menus/aside.yaml
@@ -1,9 +1,13 @@
items:
-
title: 'Baş Sahypa'
+ nesting: null
type: url
url: /2023
code: dashboard
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ri-home-gear-line
@@ -37,27 +41,39 @@ items:
items:
-
title: 'Halta Hereketleri'
+ nesting: null
type: cms-page
+ url: null
code: bagActions
reference: actions/bag
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Giriş Hereketleri'
+ nesting: null
type: url
url: /actions/bag/inbox
code: bagActions
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Çykyş Hereketleri'
+ nesting: null
type: url
url: /actions/bag/outbox
code: bagActions
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
@@ -78,27 +94,39 @@ items:
items:
-
title: 'Rulon Herketleri'
+ nesting: null
type: cms-page
+ url: null
code: rulonActions
reference: actions/rulon
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Giriş Hereketleri'
+ nesting: null
type: url
url: /actions/rulon/inbox
code: rulonActions
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Çykyş Hereketleri'
+ nesting: null
type: url
url: /actions/rulon/outbox
code: rulonActions
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
@@ -132,27 +160,39 @@ items:
items:
-
title: Hereketler
+ nesting: null
type: url
url: /product/actions
code: rawActions
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Täze Haryt Sal'
+ nesting: null
type: url
url: /product/actions/inbox
code: rawActions
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Haryt Çykarmak'
+ nesting: null
type: url
url: /product/actions/outbox
code: rawActions
+ reference: null
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
@@ -173,36 +213,52 @@ items:
items:
-
title: 'Täze Hasabat'
+ nesting: null
type: cms-page
+ url: null
code: extrudorProduction
reference: production/excruiters
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Hasabat
+ nesting: null
type: cms-page
+ url: null
code: extrudorProduction
reference: production/report-dynamic
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Aýlar Boýunça'
+ nesting: null
type: cms-page
+ url: null
code: extrudorProduction
reference: production/all-production-month
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Ýyl Boýunça'
+ nesting: null
type: cms-page
+ url: null
code: extrudorProduction
reference: production/report-production
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
@@ -223,45 +279,52 @@ items:
items:
-
title: 'Hasabat Sanawy'
+ nesting: null
type: cms-page
+ url: null
code: productionRulon
reference: machine/machine
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Rulonlar Sklady'
+ nesting: null
type: cms-page
+ url: null
code: productionRulon
reference: machine/rulon
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '1'
cssClass: ''
isExternal: '0'
-
title: Hasabat
+ nesting: null
type: cms-page
+ url: null
code: productionRulon
reference: machine/report
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Aýlar boýunça'
+ nesting: null
type: cms-page
+ url: null
code: productionRulon
reference: machine/report-production-machine
- viewBag:
- isHidden: '0'
- cssClass: ''
- isExternal: '0'
- -
- title: 'Mehanikler boýunça'
- type: cms-page
- code: productionRulon
- reference: machine/machine-production-mechanic
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
@@ -282,27 +345,39 @@ items:
items:
-
title: 'Hasabat Sanawy'
+ nesting: null
type: cms-page
+ url: null
code: sewerProduction
reference: sewer/new
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Hasabat
+ nesting: null
type: cms-page
+ url: null
code: sewerProduction
reference: sewer/report
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Aýlar boýunça'
+ nesting: null
type: cms-page
+ url: null
code: sewerProduction
reference: sewer/month
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
@@ -323,45 +398,65 @@ items:
items:
-
title: 'Sargytlar Sanawy'
+ nesting: null
type: cms-page
+ url: null
code: orders
reference: orders/new
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Logitstika
+ nesting: null
type: cms-page
+ url: null
code: orders
reference: orders/shipping
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Tölegler
+ nesting: null
type: cms-page
+ url: null
code: orders
reference: orders/payment-report
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '1'
cssClass: ''
isExternal: '0'
-
title: Hasabat
+ nesting: null
type: cms-page
+ url: null
code: orders
reference: orders/report
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Žurnal
+ nesting: null
type: cms-page
+ url: null
code: journal
reference: journal
+ cmsPage: null
+ replace: null
viewBag:
isHidden: '0'
cssClass: ri-chat-history-line
diff --git a/themes/gokbakja/pages/machine/report.htm b/themes/gokbakja/pages/machine/report.htm
index ab80000..3b88230 100644
--- a/themes/gokbakja/pages/machine/report.htm
+++ b/themes/gokbakja/pages/machine/report.htm
@@ -92,6 +92,17 @@ function onStart(){
{% endfor %}
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+