Changeset bd9e8e3 for resources

Timestamp:

10/17/21 20:28:35 (3 years ago)

Author:

Berat Kjufliju <kufliju@…>

Branches:

develop, master

Children:

e6c1f87

Parents:

d795fa6

Message:

added arch_id validation

Location:

resources

Files:

• assets/js/custom.js (modified) (1 diff)
• views/dashboard/documents/edit.blade.php (modified) (2 diffs)
• views/dashboard/settings/index.blade.php (modified) (4 diffs)

resources/assets/js/custom.js

@@ -5 +5 @@
     $(document).on('click', '.layout-builder .layout-builder-toggle', function () {
         $('.layout-builder').toggleClass('show');
+    });
+
+    $(".edit_document_deparment").change(function() {
+        var archId = $("input[name='arch_id']");
+        var currentArchId = archId.val();
+        var currentText = currentArchId.split("/")[1];
+        var selectedId = $(this).find('option:selected').val();
+
+        if(currentText.length) {
+            archId.val(selectedId + "/" + currentText);
+        } else {
+            archId.val(selectedId + "/");
+        }
     });
 

resources/views/dashboard/documents/edit.blade.php

@@ -35 +35 @@
                                                 <div class="form-group">
                                                     <label for="exampleFormControlSelect1">Department</label>
-                                                        <select class="form-control" name="department" required>
+                                                        <select class="form-control edit_document_deparment" name="department" required>
                                                             @foreach ($departments as $department)
                                                                 <option value="{{ $department->id }}" {{ old("department", $document->department->id) == $department->id ? "selected" : "" }}>{{ $department->name }}</option>
@@ -59 +59 @@
                                                 <div class="form-group">
                                                     <label>Description</label>
-                                                    <textarea class="form-control" name="description" value='{{ old("description", $document->description) }}' rows="3"></textarea>
+                                                    <textarea class="form-control" name="description" rows="3">
+                                                        {{ old("description", $document->description) }}
+                                                    </textarea>
                                                 </div>
                                             </div>

resources/views/dashboard/settings/index.blade.php

@@ -18 +18 @@
     </div>
 
-    @if(isset($link))
-        {{$link}}
-        @endif
-
     <div class="row">
         <div class="col-md-12">
@@ -28 +24 @@
                 <div class="col-lg-3 col-md-12 mb-3">
                     <div class="nav flex-lg-column flex-sm-row nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-                        <a class="nav-link active" id="v-pills-home-tab" data-toggle="pill" href="#v-pills-home" role="tab" aria-controls="v-pills-home" aria-selected="true">Account</a>
-                        <a class="nav-link" id="security-tab" data-toggle="pill" href="#security" role="tab" aria-controls="security" aria-selected="false">Security</a>
-                        <a class="nav-link" id="v-pills-settings-tab" data-toggle="pill" href="#v-pills-settings" role="tab" aria-controls="v-pills-settings" aria-selected="false">Social</a>
+                        <a class="nav-link {{ $active_tab == 'account' ? 'active' : '' }}" id="account-tab" data-toggle="pill" href="#account" role="tab" aria-controls="account" aria-selected="true">Account</a>
+                        <a class="nav-link {{ $active_tab == 'security' ? 'active' : '' }}" id="security-tab" data-toggle="pill" href="#security" role="tab" aria-controls="security" aria-selected="false">Security</a>
+                        <a class="nav-link " id="v-pills-settings-tab" data-toggle="pill" href="#v-pills-settings" role="tab" aria-controls="v-pills-settings" aria-selected="false">Social</a>
                     </div>
                 </div>
                 <div class="col-lg-9 col-md-12">
                     <div class="tab-content" id="v-pills-tabContent">
-                        <div class="tab-pane fade show active" id="v-pills-home" role="tabpanel" aria-labelledby="v-pills-home-tab">
+                        <div class="tab-pane fade show {{ $active_tab == 'account' ? 'active' : '' }}" id="account" role="tabpanel" aria-labelledby="account-tab">
                             <div class="card">
                                 <div class="card-body">
@@ -84 +80 @@
                             </div>
                         </div>
-                        <div class="tab-pane{{old('tab') == 'security' ? ' active' : null}}" id="security" role="tabpanel" aria-labelledby="security-tab">
+                        <div class="tab-pane {{ $active_tab == 'security' ? 'active' : '' }}" id="security" role="tabpanel" aria-labelledby="security-tab">
                             <div class="card">
                                 <div class="card-body">
@@ -243 +239 @@
 
 @endsection
-
-@section('script')
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha512-uto9mlQzrs59VwILcLiRYeLKPPbS/bT71da/OEBYEwcdNUk8jYIy+D176RYoop1Da+f9mvkYrmj5MCLZWEtQuA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script>
-        $(document).ready(function () {
-            if (window.location.hash) {
-                $('.nav-pills a[href="#'+window.location.hash+'"]').tabs('show');
-            }
-        });
-</script>
-@endsection