Merge branch 'amirah' into 'main'

update ayat notis lelong

See merge request online-sistem1/lelong!145

app/Http/Controllers/NotisController.php

@@ -257,8 +257,8 @@ class NotisController extends Controller
     Public function kemaskininotis(Request $request){
 
     
-        $tetapan = Tetapan::where('id','=',1)->first();
-        // dd($tetapan);
+        $tetapan = Tetapan::where('id','=',1)->get();
+
    
         return view('jananotis.kemaskininotis',compact('tetapan'));
         
@@ -294,8 +294,9 @@ class NotisController extends Controller
 
         // dd($request->all());
         $tetapan = Tetapan::find(1);
+      
         
-        $tetapan->para2 = $request->para2;
+        $tetapan->para2caw = $request->para2;
         $tetapan->update();    
 
         $cawangan = Cawangan::all();
@@ -305,8 +306,7 @@ class NotisController extends Controller
             $update = Cawangan::where('id', $updatecaw['id'])
             ->where('caw_code', $request->kodcaw)
             ->update(['para2'=>$request->para2]);
-            // $update->para2 = $request->para2;
-            // $update->update();
+           
 
         }
         

database/seeders/RolesSeeder.php

@@ -127,6 +127,10 @@ class RolesSeeder extends Seeder
             'name' => 'tetapan',
             'description' => 'Tetapan Parameter'
         ]);
+        Permission::create([
+            'name' => 'jananotis',
+            'description' => 'Ayat Notis Lelong'
+        ]);
         
 
         //account

resources/views/includes/sidebar.blade.php

@@ -268,20 +268,9 @@
 
         {{-- Kemaskini Notis --}}
         
-      <li class="{{ (request()->is('report/')) ? 'active' : '' }}">
-        <a href="#kemaskiniSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Kemaskini Notis Lelong</a>
-        <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="kemaskiniSubmenu" >
-          <li class="{{ (request()->is('jananotis/kemaskininotis/*') || request()->is('jananotis/kemaskininotis') ) ? 'active' : '' }}">
-            <a href="{{url('jananotis/kemaskininotis')}}">Semua Cawangan</a>
-          </li>
-        </ul>    
-        <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="kemaskiniSubmenu" >
-          <li class="{{ (request()->is('jananotis/kemaskininotisbycaw/*') || request()->is('jananotis/kemaskininotisbycaw') ) ? 'active' : '' }}">
-            <a href="{{url('jananotis/kemaskininotisbycaw')}}">By Cawangan</a>
-          </li>
-        </ul>  
-     
-      </li>
+        <li class="{{ (request()->is('report/*')) ? 'active' : '' }}">
+          <a href="{{url('jananotis/kemaskininotis')}}">Kemaskini Notis Lelong</a>
+        </li>
         {{-- end Kemaskini Notis --}}
         
       

resources/views/jananotis/kemaskininotis.blade.php

@@ -1,5 +1,6 @@
 @extends('layouts.app')
 
+
 @section('content')
 <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet"/>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
@@ -18,12 +19,12 @@
             @endif
             <form action="{{route('jananotis.storeall')}}" method="POST" enctype="multipart/form-data">
               @csrf
-         
-             
-                  <div class="form-group row">
-                  <div class="col-sm-4" id="para2">
-                    <textarea name="para2" rows="10" cols="100" id="article-ckeditor" required>
-                       
+              @foreach($tetapan as $notis)
+              {{-- {{dd($notis->para2)}} --}}
+              <div class="form-group row">
+                <div class="col-sm-4" id="para2">
+                    <textarea name="para2" id="article-ckeditor"  >
+                      {{$notis->para2}}
                     </textarea> 
                   </div>
                 </div>    
@@ -33,14 +34,20 @@
                     <button type="submit" class="btn btn-primary">Simpan</button>
                   </div>
                 </div>
+                @endforeach
             </form>
         </div>
         
     </div>
 </div>
+
 <script>
-  CKEDITOR.replace( 'article-ckeditor' );
-</script>
+  CKEDITOR.replace( 'article-ckeditor', {
+      height: 400,
+      width: 1500
+
+  } );
+  </script>
 <script>
   $('#caw').select2({
     width: '100%',

resources/views/jananotis/kemaskininotisbycaw.blade.php

@@ -26,7 +26,7 @@
 
                   <option value="">Sila Pilih Cawangan</option>
                   @foreach ($caw as $caws)
-                  <option value="{{$caws->caw_code}}">{{$caws->caw_name}}</option>
+                  <option value="{{$caws->caw_code}}">{{$caws->caw_name}} </option>
                   @endforeach
 
                 </select>
@@ -35,25 +35,29 @@
                            
                   <div class="form-group row">
                   <div class="col-sm-4" id="list">
-                  <textarea onchange="getSelectValue();" name="para2" rows="10" cols="100" id="article-ckeditor" id="list" required>
-                  </textarea>  
-                  </div>   
-                  <br>
-    
-                  <div class="form-group row">
+                  <textarea onchange="getSelectValue();" name="para2"  id="article-ckeditor" id="list" required>
+                  </textarea><br>
+                  </div>                  
+                 
+                  {{-- <div class="form-group row"> --}}
                   <div class="col-sm-10">
                     <button type="submit" class="btn btn-primary">Simpan</button>
                   </div>
-                </div>
+                {{-- </div> --}}
             </form>
         </div>
         
     </div>
 </div>
 <script>
-  CKEDITOR.replace( 'article-ckeditor' );
-</script>
+  CKEDITOR.replace( 'article-ckeditor', {
+      height: 400,
+      width: 1500
+
+  } );
+  </script>
 <script>
+
         
         function getSelectValue()
         {