Merge remote-tracking branch 'origin/master'

ui/src/pages/ActivityLogs.vue

@@ -1,5 +1,5 @@
 <template>
-  <q-page v-if="canReadUser" class="act-page with-bg">
+  <q-page v-if="isAllowed" class="act-page with-bg">
 
     <!-- =======================================================
          🔍 FILTER BAR
@@ -218,14 +218,14 @@
 
 
 <script setup>
-import { ref,onMounted, watch } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { date } from 'quasar'
 import { useActivityLogStore } from 'src/stores/activityLogStore'
 import { useAuthStore } from 'stores/authStore.js'
 import { usePermission } from 'src/composables/usePermission'
+import { isActivityLogsAllowedUser } from 'src/modules/activityLogs'
 
-const { canRead, canUpdate } = usePermission()
-const canReadUser = canRead('user')
+const { canUpdate } = usePermission()
 const canUpdateUser = canUpdate('user')
 
 const diffDialog = ref(false)
@@ -236,6 +236,7 @@ const selectedDiff = ref({
 })
 const store = useActivityLogStore()
 const auth = useAuthStore()
+const isAllowed = computed(() => isActivityLogsAllowedUser(auth.user))
 
 const categoryOptions = [
   { label: 'Auth', value: 'auth' },

ui/src/pages/ProductionProductCostingMTBolumMapping.vue

@@ -1,27 +1,30 @@
 <template>
   <q-page v-if="canReadOrder" class="pcmm-page q-pa-md">
-    <div class="pcmm-header row items-center q-col-gutter-md">
-      <div class="col">
-        <div class="text-h6">Maliyet Parca Eslestirme</div>
-        <div class="text-caption text-grey-7">
-          V3 Urun Ilk Grubu (42. ozellik) + Urun Ana/Alt Grup + URETIM Parca Bolum + Hammadde Turleri eslestirmesi (URETIM mk_ tablolarinda tutulur)
+    <div class="pcmm-top">
+      <div class="pcmm-header row items-center q-col-gutter-md">
+        <div class="col">
+          <div class="text-h6">Maliyet Parca Eslestirme</div>
+          <div class="text-caption text-grey-7">
+            V3 Urun Ilk Grubu (42. ozellik) + Urun Ana/Alt Grup + URETIM Parca Bolum + Hammadde Turleri eslestirmesi (URETIM mk_ tablolarinda tutulur)
+          </div>
+        </div>
+
+        <div class="col-auto">
+          <q-btn
+            color="primary"
+            icon="refresh"
+            label="Yenile"
+            :loading="loading"
+            @click="refreshAll"
+          />
         </div>
       </div>
 
-      <div class="col-auto">
-        <q-btn
-          color="primary"
-          icon="refresh"
-          label="Yenile"
-          :loading="loading"
-          @click="refreshAll"
-        />
-      </div>
+      <q-separator class="q-my-md" />
     </div>
 
-    <q-separator class="q-my-md" />
-
-    <q-table
+    <div class="pcmm-table-wrap">
+      <q-table
       class="ol-table pcmm-table"
       flat
       bordered
@@ -34,6 +37,7 @@
       no-data-label="Kayit bulunamadi"
       :rows-per-page-options="[0]"
       hide-bottom
+      sticky-header
     >
       <template #header-cell="props">
         <q-th :props="props">
@@ -279,7 +283,8 @@
           </q-select>
         </q-td>
       </template>
-    </q-table>
+      </q-table>
+    </div>
   </q-page>
 
   <q-page v-else class="q-pa-md flex flex-center">
@@ -862,6 +867,11 @@ onMounted(async () => {
 <style scoped>
 .pcmm-page {
   background: #fafafa;
+  /* Prevent page scroll; table body will scroll inside .pcmm-table-wrap */
+  height: 100%;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 
 .pcmm-header {
@@ -869,6 +879,16 @@ onMounted(async () => {
   margin: 0 auto;
 }
 
+.pcmm-top {
+  flex: 0 0 auto;
+}
+
+.pcmm-table-wrap {
+  flex: 1 1 auto;
+  min-height: 0; /* important for flex overflow scrolling */
+  overflow: auto;
+}
+
 .pcmm-form {
   max-width: 1200px;
   margin: 0 auto;
@@ -905,6 +925,14 @@ onMounted(async () => {
   line-height: 1.15;
 }
 
+/* Keep q-table top controls visible while scrolling (like sticky headers). */
+.pcmm-table :deep(.q-table__top) {
+  position: sticky;
+  top: 0;
+  z-index: 3;
+  background: #fafafa;
+}
+
 .pcmm-header-cell {
   display: flex;
   align-items: flex-start;