Merge pull request #319 from dbarzin/dev

add reset score

Author: dbarzin

app/Http/Controllers/ControlController.php

@@ -1270,9 +1270,8 @@ public function doMake(Request $request)
             '403 Forbidden'
         );
 
-        // check :
-        // plan date not in the past
-        if (request('score') === null) {
+        // Score must be set
+        if ((request('score') === null)||(request('score') == 0)) {
             return back()
                 ->withErrors(['score' => 'score not set'])
                 ->withInput();
@@ -1474,7 +1473,7 @@ public function draft(Request $request)
 
         $control->observations = request('observations');
         $control->note = request('note');
-        $control->score = request('score');
+        $control->score = request('score')==0 ? null : request('score');
 
         // only admin and user can update the plan_date and action_plan
         if (Auth::User()->role === 1 || Auth::User()->role === 2) {
@@ -1524,7 +1523,6 @@ 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;
@@ -1552,9 +1550,8 @@ public function accept()
 
         $id = (int) request('id');
 
-        // check :
-        // plan date not in the past
-        if (request('score') === null) {
+        // Score must be set
+        if ((request('score') === null)||(request('score') == 0)) {
             return back()
                 ->withErrors(['score' => 'score not set'])
                 ->withInput();
@@ -1681,7 +1678,6 @@ public function template(Request $request)
         $templateProcessor->setComplexValue('input', self::string2Textrun($control->input));
         $templateProcessor->setComplexValue('model', self::string2Textrun($control->model));
 
-//dd(urldecode($request->observations))
        $templateProcessor->setComplexValue('observations', self::string2Textrun(urldecode($request->observations)));
 
         $templateProcessor->setValue('date', Carbon::today()->format('d/m/Y'));

resources/views/controls/make.blade.php

@@ -169,6 +169,8 @@
 					<font color="orange">{{ trans('common.orange') }}</font> &nbsp;
 					<input type="radio" name="score" value="1" data-role="radio" {{ $control->score===1 ? "checked" : "" }}>
 					<font color="red">{{ trans('common.red') }}</font>
+                    <input type="radio" name="score" value="0" data-role="radio" {{ $control->score===null ? "checked" : "" }}>
+                    N/A
 				</div>
 			</div>
             @if ((Auth::User()->role === 1)||(Auth::User()->role === 2))