Shohrat
/
g_sto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated 27_12

This commit is contained in:
Shohrat 2023-12-27 12:09:21 +05:00
parent c8ec8972ab
commit 5afee5e070
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,6 +3,8 @@
composer.phar
composer.lock
/config
# Framework ignores
.env
.env.*.php

2
config/database.php
View File

@ -57,7 +57,7 @@ return [
'engine' => 'InnoDB',
'host' => 'localhost',
'port' => 3306,
'database' => 'gok_bakja_from_server',
'database' => 'gok_bakja_from_server2',
'username' => 'root',
'password' => 'bt110226',
'charset' => 'utf8mb4',

2
plugins/romanah/gokbakja/components/Production.php
View File

@ -113,7 +113,7 @@ class Production extends ComponentBase
$pivotIds = PivotProductionModel::whereIn('production_id', $calculationAmountqq)->get()->pluck('id')->toArray();
$calculationAmount = ProductionCalculateModel::whereIn('prev_pivot_id', $pivotIds)->sum("amount_calc");
$calculationAmount = ProductionCalculateModel::whereIn('production_id', $calculationAmountqq)->sum("amount_calc");
$calcHours = $productionsCalcPivot->orderBy('date', 'DESC')->orderBy('time', 'DESC')->get();

2
themes/gokbakja/pages/machine/machine.htm
View File

@ -93,7 +93,7 @@ function onStart(){
<div class="row">
{% if crudProductionRulon %}
<div class="col-md-12">
<div class="collapse multi-collapse" id="multiCollapseExample1">
<div class="collapse multi-collapse show" id="multiCollapseExample1">
<div class="card card-body">
<form data-request="onCreateMachineProduction" data-request-flash>

4
themes/gokbakja/pages/production/daily-seperate.htm
View File

@ -34,6 +34,9 @@ function onStart() {
$sumDiff = Romanah\Gokbakja\Models\ProductionCalculate::where('date', $productionDates[$x]->date)->where('excruiter_id', $productionDates[$x]->excruiter_id);
$sumDiff2 = Romanah\Gokbakja\Models\ProductionCalculate::where('date', $productionDates[$x]->date)->where('excruiter_id', $productionDates[$x]->excruiter_id);
//dd($lastId1);
$shift1 = $sumDiff->where('shift_id', 1)->sum('amount_calc');
$shift2 = $sumDiff2->where('shift_id', 2)->sum('amount_calc');
@ -48,6 +51,7 @@ function onStart() {
$products_all = $sumDiff->with('product')->groupBy('product_id')->get();
for ($xx = 0; $xx < count($products_all); $xx++) {
$sumDiffq = Romanah\Gokbakja\Models\ProductionCalculate::whereDate('date', $productionDates[$x]->date)->where('shift_id', 1)->where('excruiter_id', $productionDates[$x]->excruiter_id);
$sumDiff2q = Romanah\Gokbakja\Models\ProductionCalculate::whereDate('date', $productionDates[$x]->date)->where('shift_id', 2)->where('excruiter_id', $productionDates[$x]->excruiter_id);