Rilis Tahun Ajaran 2024/2025 Semester Ganjil

eraporsmk · Oct 4, 2024 · 91ac448 · 91ac448
1 parent 4ad2f73
commit 91ac448
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 39 deletions.
diff --git a/app/Console/Commands/EraporUpdate.php b/app/Console/Commands/EraporUpdate.php
@@ -181,6 +181,25 @@ public function handle()
                     ]
                 ],
             ],
+            [
+                'tahun_ajaran_id' => 2024,
+                'nama' => '2024/2025',
+                'periode_aktif' => 1,   
+                'semester' => [
+                    [
+                        'semester_id' => 20241,
+                        'nama' => '2024/2025 Ganjil',
+                        'semester' => 1,
+                        'periode_aktif' => 1,
+                    ],
+                    [
+                        'semester_id' => 20242,
+                        'nama' => '2024/2025 Genap',
+                        'semester' => 2,
+                        'periode_aktif' => 0,
+                    ]
+                ],
+            ],
         ];
         foreach($ajaran as $a){
             Tahun_ajaran::updateOrCreate(
@@ -229,8 +248,8 @@ public function handle()
                 }
             }
         }
-        Semester::where('semester_id', '<>', '20232')->update(['periode_aktif' => 0]);
-        Semester::where('semester_id', '20232')->update(['periode_aktif' => 1]);
+        Semester::where('semester_id', '<>', '20241')->update(['periode_aktif' => 0]);
+        Semester::where('semester_id', '20241')->update(['periode_aktif' => 1]);
         $guru = Guru::whereRaw('guru_id <> guru_id_dapodik')->first();
         if($guru){
             $semester = Semester::where('periode_aktif', 1)->first();

diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php
@@ -67,8 +67,8 @@ function filter_pembelajaran_agama($agama_siswa, $nama_agama){
     }
 }
 function jenis_gtk($query){
-    $data['tendik'] = array(11, 30, 40, 41, 42, 43, 44, 57, 58, 59);
-    $data['guru'] = array(3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 20, 25, 26, 51, 52, 53, 54, 56);
+    $data['tendik'] = array(11, 30, 40, 41, 42, 43, 44, 57, 58, 59, 91, 93);
+    $data['guru'] = array(3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 20, 25, 26, 51, 52, 53, 54, 56, 92);
     $data['instruktur'] = array(97);
     $data['asesor'] = array(98);
     return collect($data[$query]);

diff --git a/app_version.txt b/app_version.txt
@@ -1 +1 @@
-7.0.5
+7.0.6
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/chunks/16.fa6c8e91d8547e30a99b.js → public/js/chunks/16.f868f725832e6e57112f.js b/public/js/chunks/16.fa6c8e91d8547e30a99b.js → public/js/chunks/16.f868f725832e6e57112f.js
diff --git a/...ks/16.fa6c8e91d8547e30a99b.js.LICENSE.txt → ...ks/16.f868f725832e6e57112f.js.LICENSE.txt b/...ks/16.fa6c8e91d8547e30a99b.js.LICENSE.txt → ...ks/16.f868f725832e6e57112f.js.LICENSE.txt
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=9a0ee49b342ea4f86ab4",
+    "/js/app.js": "/js/app.js?id=3adc3be982990d9b4f2e",
     "/css/core.css": "/css/core.css?id=5d902ae10f7a46837492",
     "/css/loader.css": "/css/loader.css?id=4f39b56a667dc447a5fe"
 }
diff --git a/resources/js/src/@core/layouts/components/app-navbar/components/Logo-kanan.vue b/resources/js/src/@core/layouts/components/app-navbar/components/Logo-kanan.vue
@@ -23,37 +23,6 @@
         <feather-icon size="16" icon="LogOutIcon" class="mr-50" />
         <span>Logout</span>
       </b-dropdown-item>
-      <!--b-dropdown-item :to="{ name: 'apps-email' }" link-class="d-flex align-items-center">
-        <feather-icon size="16" icon="MailIcon" class="mr-50" />
-        <span>Inbox</span>
-      </b-dropdown-item>
-      <b-dropdown-item :to="{ name: 'apps-todo' }" link-class="d-flex align-items-center">
-        <feather-icon size="16" icon="CheckSquareIcon" class="mr-50" />
-        <span>Task</span>
-      </b-dropdown-item>
-      <b-dropdown-item :to="{ name: 'apps-chat' }" link-class="d-flex align-items-center">
-        <feather-icon size="16" icon="MessageSquareIcon" class="mr-50" />
-        <span>Chat</span>
-      </b-dropdown-item>
-
-      <b-dropdown-divider />
-
-      <b-dropdown-item :to="{ name: 'pages-account-setting' }" link-class="d-flex align-items-center">
-        <feather-icon size="16" icon="SettingsIcon" class="mr-50" />
-        <span>Settings</span>
-      </b-dropdown-item>
-      <b-dropdown-item :to="{ name: 'pages-pricing' }" link-class="d-flex align-items-center">
-        <feather-icon size="16" icon="CreditCardIcon" class="mr-50" />
-        <span>Pricing</span>
-      </b-dropdown-item>
-      <b-dropdown-item :to="{ name: 'pages-faq' }" link-class="d-flex align-items-center">
-        <feather-icon size="16" icon="HelpCircleIcon" class="mr-50" />
-        <span>FAQ</span>
-      </b-dropdown-item>
-      <b-dropdown-item link-class="d-flex align-items-center" @click="logout">
-        <feather-icon size="16" icon="LogOutIcon" class="mr-50" />
-        <span>Logout</span>
-      </b-dropdown-item-->
     </b-nav-item-dropdown>
     <b-nav v-if="!userData">
       <b-nav-item :to="{ name: 'auth-login' }"><b-icon-shield-lock></b-icon-shield-lock> Login</b-nav-item>

diff --git a/resources/views/changelog.blade.php b/resources/views/changelog.blade.php
@@ -1,4 +1,10 @@
 <div id="form">
+    <legend>
+        <h3>Versi 7.0.6</h3>
+    </legend>
+    <ol>
+        <li><b class="text-success">[Pembaharuan]</b> Rilis Tahun Ajaran 2024/2025 Semester Ganjil</li>
+    </ol>
     <legend>
         <h3>Versi 7.0.5</h3>
     </legend>