Merge pull request #183 from dbarzin/dev

Dev
dbarzin · Oct 15, 2024 · 87c0316 · 87c0316
2 parents 76d2b8f + c83485a
commit 87c0316
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/.env.example b/.env.example
@@ -6,7 +6,7 @@ APP_URL=http://deming.yourdomain.com
 APP_TIMEZONE='Europe/Paris'
 
 DB_CONNECTION=mysql
-DB_HOST=mysql
+DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=deming
 DB_USERNAME=deming_user

diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
@@ -1498,6 +1498,7 @@ public function reject(Request $request)
         $control->score = request('score');
         $control->plan_date = request('plan_date');
         $control->action_plan = request('action_plan');
+        // $control->realisation_date = null;
 
         // Reject -> set status=0
         $control->status = 0;

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
@@ -221,7 +221,14 @@ private function generateMadeControlTable(
 
         //----------------------------------------------------------------
         // create table
-        $table = new Table(['borderSize' => 3, 'borderColor' => 'black', 'width' => 9800, 'unit' => TblWidth::TWIP]);
+        $table = new Table(
+            [
+            'borderSize' => 3,
+            'borderColor' => 'black',
+            'width' => 9800,
+            'unit' => TblWidth::TWIP,
+            'layout' => \PhpOffice\PhpWord\Style\Table::LAYOUT_FIXED,
+            ]);
         // create header
         $table->addRow();
         $table->addCell(2000, ['bgColor' => '#FFD5CA'])
@@ -378,7 +385,14 @@ private function generateKPITable(TemplateProcessor $templateProcessor, $framewo
         $domains = $domains->get();
 
         // create table
-        $table = new Table(['borderSize' => 3, 'borderColor' => 'black', 'width' => 9800, 'unit' => TblWidth::TWIP]);
+        $table = new Table(
+            [
+                'borderSize' => 3,
+                'borderColor' => 'black',
+                'width' => 9800,
+                'unit' => TblWidth::TWIP,
+                'layout' => \PhpOffice\PhpWord\Style\Table::LAYOUT_FIXED
+            ]);
         // create header
         $table->addRow();
         $table->addCell(2000, ['bgColor' => '#FFD5CA'])
@@ -511,7 +525,14 @@ private function generateActionPlanTable(
             });
         }
 
-        $table = new Table(['borderSize' => 3, 'borderColor' => 'black', 'width' => 9800, 'unit' => TblWidth::TWIP]);
+        $table = new Table(
+            [
+                'borderSize' => 3,
+                'borderColor' => 'black',
+                'width' => 9800,
+                'unit' => TblWidth::TWIP,
+                'layout' => \PhpOffice\PhpWord\Style\Table::LAYOUT_FIXED
+            ]);
 
         // create header
         $table->addRow();

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
@@ -82,7 +82,7 @@
 					<label class="label" for="description">{{ trans('cruds.user.fields.email') }}</label>
 				</div>
 	    		<div class="cell-3">
-					<input type="text" name="email" class="input {{ $errors->has('email') ? 'is-danger' : ''}}" value="{{ $errors->has('email') ?  old('email') : $user->email }}" size="120">
+					<input type="text" name="email" class="input {{ $errors->has('email') ? 'is-danger' : ''}}" value="{{ old('email', $user->email) }}" size="120">
 				</div>
 			</div>