Merge pull request #467 from dbarzin/dev

Dev

Author: dbarzin

resources/lang/de/cruds.php

@@ -119,6 +119,7 @@
          'groupBy' => 'Gruppiert nach',
          'calendar' => 'Kalender',
        	 'create_action' => 'Aktionsplan erstellen',
+         'confirm_delete' => 'Möchten Sie die Kontrollen löschen?'
      ],
      'notification' => [
          'subject' => 'Liste der durchzuführenden Maßnahmen',

resources/lang/en/cruds.php

@@ -120,7 +120,8 @@
         'title_singular' => 'Measurement',
         'groupBy' => 'Group by',
         'create_action' => 'Create an action plan',
-        'calendar' => 'Calendar'
+        'calendar' => 'Calendar',
+        'confirm_delete' => 'Are you sure you want to delete measurements?'
     ],
      'notification' => [
          'subject' => 'Measurement list to carry out',

resources/lang/fr/cruds.php

@@ -120,7 +120,8 @@
         'title_singular' => 'Contrôle',
         'groupBy' => 'Groupé par',
         'create_action' => 'Créer un plan d\'action',
-        'calendar' => 'Calendrier'
+        'calendar' => 'Calendrier',
+        'confirm_delete' => 'Etes vous sur de vouloir supprimer des contrôles ?'
     ],
     'measure' => [
         'title' => 'Mesure',

resources/views/controls/edit.blade.php

@@ -247,6 +247,7 @@
     	</div>
     </form>
 </div>
+
 <script>
 document.addEventListener("DOMContentLoaded", function () {
 

resources/views/controls/make.blade.php

@@ -14,7 +14,7 @@
 
 @include('partials.errors')
 
-<form method="POST" action="/bob/make" enctype="multipart/form-data">
+<form method="POST" action="/bob/make" enctype="multipart/form-data" class="needs-validation">
 	@csrf
 	<input type="hidden" name="id" value="{{ $control->id }}"/>
 
@@ -134,9 +134,21 @@
     		<div class="cell-lg-1 cell-md-2">
 	    		<strong>{{ trans('cruds.control.fields.note') }}</strong>
 	    	</div>
-    		<div class="cell-lg-1 cell-md-2">
+            <div class="cell-lg-2 cell-md-3">
 				<input type="text" data-role="spinner" name="note" data-min-value="0" data-max-value="100"
                 value="{{ count($errors)>0 ?  old('note') : $control->note }}">
+<br><br>
+    <input
+        data-role="spinner"
+        type="number"
+        id="percentage"
+        name="percentage"
+        min="0"
+        max="100"
+        step="1"
+        placeholder="0.00"
+    >
+
     		</div>
 	    </div>
 
@@ -457,6 +469,21 @@ function waitForEasyMDE(id, callback) {
       });
     });
 
+    //--------------------------------------------------
+    // Validation
+    //---------------------------------------------------
+    const forms = document.querySelectorAll('.needs-validation');
+
+    forms.forEach(function (form) {
+        form.addEventListener('submit', function (event) {
+            if (!form.checkValidity()) {
+                event.preventDefault();
+                event.stopPropagation();
+            }
+
+            form.classList.add('was-validated');
+        }, false);
+    });
 });
 
 </script>

resources/views/controls/show.blade.php

@@ -293,6 +293,12 @@
 	    			{{ trans("common.delete") }}
 	    		</button>
 			</form>
+		    &nbsp;
+			<a class="button" href="/logs/history/{{ $control->id }}">
+                <span class="mif-log-file"></span>
+                &nbsp;
+				{{ trans("common.history") }}
+            </a>
 		    &nbsp;
    			@endif
             <a class="button" href="/bob/index">

resources/views/documents/index.blade.php

@@ -78,7 +78,7 @@ function bytesToHuman($bytes) {
 </div>
 <br>
 <div data-role="panel" data-title-caption="{{ trans('cruds.document.title.cleanup') }}" data-collapsible="false" data-title-icon="<span class='mif-file-text'></span>">
-    <form action="/doc/config" method="POST">
+    <form id="cleanupForm" action="/doc/config" method="POST">
 	@csrf
     <div class="grid">
         <div class="row">
@@ -88,7 +88,7 @@ function bytesToHuman($bytes) {
         </div>
         <div class="row">
             <div class="cell-2">
-                <select name="duration" data-role="select" data-prepend="{{ trans('cruds.document.month') }}">
+                <select id="durationSelect" name="duration" data-role="select" data-prepend="{{ trans('cruds.document.month') }}">
                     <option value="0" {{ ($duration=="0" || $duration==null)  ? 'selected' : '' }}>{{ trans('cruds.document.never') }}</option>
                     <option {{ $duration=="12" ? 'selected' : '' }}>12</option>
                     <option {{ $duration=="24" ? 'selected' : '' }}>24</option>
@@ -113,7 +113,7 @@ function bytesToHuman($bytes) {
                     {{ trans("common.test") }}
                 </button>
                 &nbsp;
-                <button type="submit" class="button alert" name="action" value="delete">
+                <button type="submit" class="button alert" name="action" value="delete" id="deleteButton">
                     <span class="mif-bin"></span>
                     &nbsp;
                     {{ trans("common.delete") }}
@@ -124,4 +124,15 @@ function bytesToHuman($bytes) {
     </form>
 </div>
 
+<script>
+document.addEventListener("DOMContentLoaded", function () {
+    document.getElementById("deleteButton").addEventListener("click", function (event) {
+        const select = document.getElementById("durationSelect");
+        const selected = select.options[select.selectedIndex].value;
+        if ((selected==0)||(!confirm("{{ trans('cruds.control.confirm_delete') }}")))
+            event.preventDefault();
+    });
+});
+</script>
+
 @endsection