Şifremi sıfırla sayfası

- Piyango bilgi yükleniyor uyarısı
- Piyango bilgileri üye kontrol butonu

src/components/DashPiyangoListe.vue

@@ -10,7 +10,7 @@
       </h1>
       <div class="section-header-buttons-c">
         <icon-button
-          toRoute="/piyangolar/piyango-listesi"
+          @click="goToListWithFilter"
           icon="list"
           iconClass="ico-section ico-section-header-btn" />
       </div>
@@ -60,9 +60,11 @@
 <script setup lang="ts">
   import { ref } from 'vue'
   import { useDateStore } from '@/stores/dateStore'
+  import { useRouter } from 'vue-router'
   import icourl from '@/assets/images/icons.svg'
 
   const dateStore = useDateStore()
+  const router = useRouter()
 
   const props = defineProps<{
     tableData: Record<string, any>
@@ -76,6 +78,7 @@
     dateKey: string
     iconBack: string
     total: number
+    filterParams?: Record<string, any>
   }>()
   const totalData = ref<number>(props.total)
 
@@ -92,4 +95,18 @@
   const OnClick = (e: Event, row: object) => {
     emit('click', row)
   }
+
+  const goToListWithFilter = () => {
+    const query: Record<string, any> = {}
+    
+    // Filtre parametrelerini query'ye ekle
+    if (props.filterParams) {
+      Object.assign(query, props.filterParams)
+    }
+    
+    router.push({
+      path: '/piyangolar/piyango-listesi',
+      query: query
+    })
+  }
 </script>

src/components/global/ListTableContent.vue

@@ -590,6 +590,17 @@
     searchForm.value = false
     mobileButtons.value = false
   }
+
+  // Filtre başlığını almak için yardımcı fonksiyon
+  const getFilterTitle = (key: string): string => {
+    const filterTitles: Record<string, string> = {
+      'durumId': 'Durum',
+      'piyangoAmacId': 'Piyango Amacı',
+      'cekilisYontemiId': 'Çekiliş Yöntemi'
+    }
+    return filterTitles[key] || key
+  }
+
   onBeforeMount(() => {
     if (globalStore.screenWidth >= globalStore.breakPoints.tabletp)
       mobileButtons.value = true
@@ -598,6 +609,21 @@
     RouteSearchControl()
     RouteFilterControl()
 
+    // URL query parametrelerini kontrol et ve filtreleri uygula (ilk istekten önce)
+    if (Object.keys(route.query).length > 0) {
+      Object.keys(route.query).forEach(key => {
+        const value = route.query[key]
+        if (value && typeof value === 'string') {
+          // Filtre parametresini filterParams'a ekle
+          filterParams[key] = {
+            val: value,
+            op: '=',
+            title: getFilterTitle(key)
+          }
+        }
+      })
+    }
+
     if (props.apiList !== undefined) GetLocalData()
 
     window.addEventListener('resize', Resize)

src/init/axios-init.ts

@@ -48,7 +48,7 @@ axios.interceptors.response.use(
       const token = sessionStorage.getItem(usersStore.userStorageKeys.TOKEN)
       if (token !== undefined) {
         usersStore.ResetUserData()
-        router.push('/login')
+        router.push('/giris')
       }
     }
     return Promise.reject(error)

src/layouts/admin-inc/ProfileMenu.vue

@@ -71,7 +71,7 @@
       let dt = await dataStore.dataPost('Auth/logout')
     }
     usersStore.ResetUserData()
-    router.push('/login')
+    router.push('/giris')
   }
 
   const closeProfileMenu = (e: Event) => {

src/module/auth/routes/forgot-password.ts

@@ -1,7 +1,7 @@
 import ForgotPassword from '@/module/auth/views/ForgotPassword.vue'
 
 export default {
-  path: '/forgot-password',
+  path: '/sifremi-unuttum',
   name: 'ForgotPassword',
   component: ForgotPassword,
   meta: {

src/module/auth/routes/index.ts

@@ -1,11 +1,6 @@
-import Login from "@/module/auth/routes/login";
+import Login from '@/module/auth/routes/login'
-import Register from "@/module/auth/routes/register";
+import Register from '@/module/auth/routes/register'
-import ForgotPassword from "@/module/auth/routes/forgot-password";
+import ForgotPassword from '@/module/auth/routes/forgot-password'
-
+import ResetPassword from '@/module/auth/routes/reset-password'
-export default [
-    Login,
-    Register,
-    ForgotPassword
-]
-
 
+export default [Login, Register, ForgotPassword, ResetPassword]

src/module/auth/routes/login.ts

@@ -1,7 +1,7 @@
 import Login from '@/module/auth/views/Login.vue'
 
 export default {
-  path: '/login',
+  path: '/giris',
   name: 'Login',
   component: Login,
   meta: {

src/module/auth/routes/register.ts

@@ -1,7 +1,7 @@
 import Register from '@/module/auth/views/Register.vue'
 
 export default {
-  path: '/register',
+  path: '/kayit-ol',
   name: 'Register',
   component: Register,
   meta: {

src/module/auth/routes/reset-password.ts

@@ -0,0 +1,10 @@
+import ResetPassword from '@/module/auth/views/ResetPassword.vue'
+
+export default {
+  path: '/sifreyi-sifirla',
+  name: 'ResetPassword',
+  component: ResetPassword,
+  meta: {
+    authpage: true
+  }
+}

src/module/auth/services/authService.ts

@@ -1,17 +1,59 @@
 import { defineStore } from 'pinia'
 import { useDataStore } from '@/stores/dataStore'
 import { useAuthStore } from '../stores/authStore'
+import { useAuthValidationStore } from '../validation/authValidationStore'
+import { useUsersStore } from '@/stores/usersStore'
+import router from '@/router'
 
-export const useAppService = defineStore('appService', () => {
+export const useAuthService = defineStore('authService', () => {
   const dataStore = useDataStore()
   const authStore = useAuthStore()
+  const authValidationStore = useAuthValidationStore()
+  const usersStore = useUsersStore()
 
-  const GetAAuthRoleList = async () => {
+  const Login = async () => {
-    if (authStore.rolesList.length === 0) {
+    if (authValidationStore.LoginFormCheck()) {
-      let data = await dataStore.dataGet('Auth/rolelistesi')
+      let login = await dataStore.dataPost('Auth/login', {
-      authStore.rolesList = data
+        data: authStore.loginData
+      })
+      Object.assign(authStore.loginData, authStore.safeLoginData)
+      if (login !== 'errorfalse') {
+        await usersStore.SetUserSessionData(login)
+        await usersStore.SetUserData()
+
+        if (usersStore.isPanelUser) {
+          router.push('/')
+        } else {
+          if (usersStore.userStatus === 0 || usersStore.userStatus === null) {
+            router.push('/profil')
+          } else {
+            router.push('/')
+          }
+        }
+      } else {
+        authValidationStore.loginMessageType = 'alert'
+        authValidationStore.loginMessage =
+          'Kullanıcı adı veya şifrenizi yanlış girdiniz. Lütfen kontrol edip tekrar deneyiniz.'
+        authValidationStore.isLoginMessage = true
+      }
+    } else {
+      authValidationStore.isLoginFormValid = true
     }
   }
 
-  return {GetAAuthRoleList}
+  const ResetPassword = async () => {
+    if (authValidationStore.ResetPasswordFormCheck()) {
+      let dt: any
+
+      dt = await dataStore.dataPost('ResetPassword', {
+        data: authStore.resetPasswordForm
+      })
+      if (dt !== 'errorfalse') {
+      }
+    } else {
+      authValidationStore.isResetPasswordFormValid = true
+    }
+  }
+
+  return { Login, ResetPassword }
 })

src/module/auth/stores/authStore.ts

@@ -1,12 +1,19 @@
 import { defineStore } from 'pinia'
-import { ref,reactive } from 'vue'
+import { ref, reactive } from 'vue'
 
 export const useAuthStore = defineStore('authStore', () => {
   const loginData = reactive<Record<string, any>>({ username: '', password: '' })
   const safeLoginData = reactive<Record<string, any>>({})
   const rolesList = ref<Record<string, any>[]>([])
+  const resetCheckData = ref<string>('')
+
+  const resetPasswordForm = reactive<Record<string, any>>({
+    newPassword: '',
+    newPasswordRepeat: '',
+    check: ''
+  })
 
   Object.assign(safeLoginData, loginData)
 
-  return { loginData, safeLoginData, rolesList }
+  return { loginData, safeLoginData, rolesList, resetPasswordForm, resetCheckData }
 })

src/module/auth/stores/authValidationStore.ts

@@ -1,46 +0,0 @@
-import { defineStore } from 'pinia'
-import { ref, reactive } from 'vue'
-import { useAuthStore } from './authStore'
-import { useValidationStore } from '@/stores/validationStore'
-
-export const useAuthValidationStore = defineStore('authValidationStore', () => {
-  const authStore = useAuthStore()
-  const validationStore = useValidationStore()
-
-  const isFormValid = ref<boolean>(true)
-  const isLoginMessage = ref<boolean>(false)
-  const loginMessageType = ref<string>('success')
-  const loginMessage = ref<string>('')
-  const registerMessage = ref<string>('')
-  const invalidTexts = reactive<Record<string, any>>({})
-
-  const FormCheck = (): boolean => {
-    Object.assign(invalidTexts, {})
-
-    validationStore.IsFieldEmpty(
-      authStore.loginData,
-      invalidTexts,
-      'username',
-      'Kullanıcı adı alanını doldurmalısınız. Örn: isim@alanadi.td'
-    )
-    validationStore.IsFieldEmpty(
-      authStore.loginData,
-      invalidTexts,
-      'password',
-      'Lütfen şifrenizi giriniz.'
-    )
-
-    isFormValid.value = Object.keys(invalidTexts).length === 0
-    return isFormValid.value
-  }
-
-  return {
-    isFormValid,
-    invalidTexts,
-    isLoginMessage,
-    loginMessageType,
-    loginMessage,
-    registerMessage,
-    FormCheck
-  }
-})

src/module/auth/validation/authValidationStore.ts

@@ -0,0 +1,89 @@
+import { defineStore } from 'pinia'
+import { ref, reactive } from 'vue'
+import { useValidationStore } from '@/stores/validationStore'
+import { useAuthStore } from '../stores/authStore'
+
+export const useAuthValidationStore = defineStore('authValidationStore', () => {
+  const validationStore = useValidationStore()
+  const authStore = useAuthStore()
+
+  const isLoginMessage = ref<boolean>(false)
+  const loginMessageType = ref<string>('success')
+  const loginMessage = ref<string>('')
+  const registerMessage = ref<string>('')
+
+  const loginInvalidTexts = reactive<Record<string, any>>({})
+  const isLoginFormValid = ref<boolean>(true)
+  const resetPasswordFormChanged = ref<boolean>(false)
+  const isResetPasswordFormValid = ref<boolean>(true)
+  const resetPasswordInvalidTexts = reactive<Record<string, any>>({})
+
+  const LoginFormCheck = (): boolean => {
+    Object.assign(loginInvalidTexts, {})
+
+    validationStore.IsFieldEmpty(
+      authStore.loginData,
+      loginInvalidTexts,
+      'username',
+      'Kullanıcı adı alanını doldurmalısınız. Örn: isim@alanadi.td'
+    )
+    validationStore.IsFieldEmpty(
+      authStore.loginData,
+      loginInvalidTexts,
+      'password',
+      'Lütfen şifrenizi giriniz.'
+    )
+
+    isLoginFormValid.value = Object.keys(loginInvalidTexts).length === 0
+    return isLoginFormValid.value
+  }
+
+  const ResetPasswordFormCheck = (): boolean => {
+    Object.assign(resetPasswordInvalidTexts, {})
+
+    validationStore.IsFieldEmpty(
+      authStore.resetPasswordForm,
+      resetPasswordInvalidTexts,
+      'newPassword',
+      'Lütfen yeni şifrenizi giriniz.'
+    )
+
+    validationStore.IsFieldEmpty(
+      authStore.resetPasswordForm,
+      resetPasswordInvalidTexts,
+      'newPasswordRepeat',
+      'Lütfen yeni şifrenizi tekrar giriniz.'
+    )
+
+    if (
+      !validationStore.checkEmpty(authStore.resetPasswordForm.newPassword) &&
+      !validationStore.checkEmpty(authStore.resetPasswordForm.newPasswordRepeat)
+    ) {
+      if (
+        authStore.resetPasswordForm.newPassword !==
+        authStore.resetPasswordForm.newPasswordRepeat
+      ) {
+        isResetPasswordFormValid.value = false
+        resetPasswordInvalidTexts.newPasswordRepeat =
+          'Şifrenizi tekrar doğru girdiğinizden emin olunuz.'
+      }
+    }
+
+    isResetPasswordFormValid.value = Object.keys(resetPasswordInvalidTexts).length === 0
+    return isResetPasswordFormValid.value
+  }
+
+  return {
+    isLoginMessage,
+    loginMessageType,
+    loginMessage,
+    loginInvalidTexts,
+    registerMessage,
+    isLoginFormValid,
+    resetPasswordFormChanged,
+    isResetPasswordFormValid,
+    resetPasswordInvalidTexts,
+    LoginFormCheck,
+    ResetPasswordFormCheck
+  }
+})

src/module/auth/views/ForgotPassword.vue

@@ -24,7 +24,7 @@
           </button>
         </form>
         <div class="login-nav login-nav-back">
-          <RouterLink to="/login">&lt; Geri</RouterLink>
+          <RouterLink to="/giris">&lt; Geri</RouterLink>
         </div>
       </div>
     </section>

src/module/auth/views/Login.vue

@@ -3,14 +3,12 @@
     <section class="section-login">
       <div class="login-header">
         <div class="logo-header">
-          <img
+          <img src="@/assets/images/cekilisevi-logo-n.png" alt="MPI Çekiliş Evi" />
-            src="@/assets/images/cekilisevi-logo-n.png"
-            alt="MPI Çekiliş Evi"/>
         </div>
         <h1>Giriş Yap</h1>
       </div>
       <div class="section-content">
-        <form action="#" id="login-form" @submit.prevent="Login">
+        <form action="#" id="login-form" @submit.prevent="authService.Login">
           <form-input
             type="email"
             modelKey="username"
@@ -18,12 +16,11 @@
             required
             label="Kullanıcı Adı (e-posta adresi)"
             placeholder="eposta@alanadi.com"
-            :invalidText="authValidationStore.invalidTexts.username" />
+            :invalidText="authValidationStore.loginInvalidTexts.username" />
 
           <form-input
             type="password"
             label="Şifre"
-           
             v-model="authStore.loginData.password"
             required />
 
@@ -32,64 +29,38 @@
             v-if="authValidationStore.isLoginMessage">
             <span>{{ authValidationStore.loginMessage }}</span>
           </div>
-          <button class="button-c button-second button-login" type="submit">
+          <button
+            class="button-c button-second button-login"
+            type="submit"
+            @submit="authService.Login"
+            @click="authService.Login">
             Giriş Yap
           </button>
         </form>
         <div class="login-nav">
-          <RouterLink to="/forgot-password">Şifremi Unuttum</RouterLink>
+          <RouterLink to="/sifremi-unuttum">Şifremi Unuttum</RouterLink>
-          <RouterLink to="/register">Kaydol</RouterLink>
+          <RouterLink to="/kayit-ol">Kayıt Ol</RouterLink>
         </div>
       </div>
     </section>
   </GuestLayout>
 </template>
 <script setup lang="ts">
-  import { onBeforeMount, reactive, ref } from 'vue'
+  import { onBeforeMount } from 'vue'
 
   import { useUsersStore } from '@/stores/usersStore'
   const usersStore = useUsersStore()
-  import { useDataStore } from '@/stores/dataStore'
-  const dataStore = useDataStore()
   import { useAuthStore } from '../stores/authStore'
   const authStore = useAuthStore()
-  import { useAuthValidationStore } from '../stores/authValidationStore'
+  import { useAuthValidationStore } from '../validation/authValidationStore'
   const authValidationStore = useAuthValidationStore()
+  import { useAuthService } from '../services/authService'
+  const authService = useAuthService()
   import router from '@/router'
 
   import GuestLayout from '@/layouts/GuestLayout.vue'
 
-  const Login = async () => {
+  onBeforeMount(() => {
-    if (authValidationStore.FormCheck()) {
+    if (usersStore.userIsAuth) router.push('/')
-      let login = await dataStore.dataPost('Auth/login', {
-        data: authStore.loginData
-      })
-      Object.assign(authStore.loginData, authStore.safeLoginData)
-      if (login !== 'errorfalse') {
-        await usersStore.SetUserSessionData(login)
-        await usersStore.SetUserData()
-
-        if (usersStore.isPanelUser) {
-          router.push('/')
-        } else {
-          if (usersStore.userStatus === 0 || usersStore.userStatus === null) {
-            router.push('/profil')
-          } else {
-            router.push('/')
-          }
-        }
-      } else {
-        authValidationStore.loginMessageType = 'alert'
-        authValidationStore.loginMessage =
-          'Kullanıcı adı veya şifrenizi yanlış girdiniz. Lütfen kontrol edip tekrar deneyiniz.'
-        authValidationStore.isLoginMessage = true
-      }
-    } else {
-      authValidationStore.isFormValid = true
-    }
-  }
-
-  onBeforeMount(() => {  
-    if(usersStore.userIsAuth) router.push('/')
   })
 </script>

src/module/auth/views/Register.vue

@@ -339,7 +339,7 @@
           </button>
         </form>
         <div class="login-nav login-nav-back">
-          <RouterLink to="/login">&lt; Geri</RouterLink>
+          <RouterLink to="/giris">&lt; Geri</RouterLink>
         </div>
       </div>
     </section>
@@ -355,7 +355,7 @@
   const globalDataStore = useGlobalDataStore()
   import { useValidationStore } from '@/stores/validationStore'
   const validationStore = useValidationStore()
-  import { useAuthValidationStore } from '../stores/authValidationStore'
+  import { useAuthValidationStore } from '../validation/authValidationStore'
   const authValidationStore = useAuthValidationStore()
   import router from '@/router'
 
@@ -413,7 +413,7 @@
           'Başarıyla kayıt oldunuz. Kullanıcı adı ve şifreniz ile giriş yapabilirsiniz.'
         authValidationStore.isLoginMessage = true
 
-        router.push('/login')
+        router.push('/giris')
       }
     } else {
       uyeBilgileriStore.isFormValid = true

src/module/auth/views/ResetPassword.vue

@@ -0,0 +1,62 @@
+<template>
+  <GuestLayout>
+    <section class="section-login">
+      <div class="login-header">
+        <div class="logo-header">
+          <img src="@/assets/images/cekilisevi-logo-n.png" alt="MPI Çekiliş Evi" />
+        </div>
+        <h1>Şifremi Sıfırla</h1>
+      </div>
+      <div class="section-content">
+        <form id="sifremi-unuttum" @submit.prevent="authService.ResetPassword">
+          <form-input
+            type="password"
+            modelKey="newPassword"
+            v-model="authStore.resetPasswordForm.newPassword"
+            required
+            label="Yeni Şifre"
+            placeholder="Yeni Şifre"
+            :invalidText="authValidationStore.resetPasswordInvalidTexts.newPassword" />
+          <form-input
+            type="password"
+            modelKey="newPasswordRepeat"
+            v-model="authStore.resetPasswordForm.newPasswordRepeat"
+            required
+            label="Yeni Şifre Tekrar"
+            placeholder="Yeni Şifre Tekrar"
+            :invalidText="
+              authValidationStore.resetPasswordInvalidTexts.newPasswordRepeat
+            " />
+          <button
+            class="button-c button-second button-login"
+            type="submit"
+            @submit="authService.ResetPassword"
+            @click="authService.ResetPassword">
+            Şifremi Sıfırla
+          </button>
+        </form>
+        <div class="login-nav login-nav-back">
+          <RouterLink to="/giris">&lt; Geri</RouterLink>
+        </div>
+      </div>
+    </section>
+  </GuestLayout>
+</template>
+<script setup lang="ts">
+  import { onMounted } from 'vue'
+  import GuestLayout from '@/layouts/GuestLayout.vue'
+  import { useAuthStore } from '../stores/authStore'
+  const authStore = useAuthStore()
+  import { useAuthService } from '../services/authService'
+  const authService = useAuthService()
+  import { useAuthValidationStore } from '../validation/authValidationStore'
+  const authValidationStore = useAuthValidationStore()
+  import { useRoute, useRouter } from 'vue-router'
+  const route = useRoute()
+  const router = useRouter()
+  onMounted(() => {
+    if (route.query && route.query.check !== undefined)
+      authStore.resetCheckData = route.query.check as string
+    else router.push('/giris')
+  })
+</script>

src/module/cekilisler/components/TabPiyangoKatilimciListesi.vue

@@ -148,6 +148,8 @@
   const uploadProgressValue = ref(0)
   const uploadProgressPanel = ref(false)
 
+  const connectionId = ref('')
+
   const tableHeader = ref<Record<string, any>[]>([
     {
       name: 'cekilisKatilimSiraNo',
@@ -252,7 +254,8 @@
     else return ''
   })
 
-  const AddNewDocument = () => {
+  const AddNewDocument = async () => {
+    connectionId.value = await connectToHub()
     dataStore.panelData = {
       title: '',
       file: ''
@@ -277,7 +280,7 @@
     piyangoKatilimciStore.katilimciUserPanel = true
   }
   const FileUpload = async () => {
-    const connectionId = await connectToHub()
+    // Mevcut bağlantıyı kullan (AddNewDocument'te açıldı)
 
     // Progress modal'ı aç
     uploadProgressValue.value = 0
@@ -302,7 +305,7 @@
     )
     console.log(dataStore.panelData)
     const response = await dataStore.dataPost(
-      `Katilimci/ExcelleYukle/${piyangoStore.selectedLottery}?connectionId=${connectionId}`,
+      `Katilimci/ExcelleYukle/${piyangoStore.selectedLottery}?connectionId=${connectionId.value}`,
       {
         data: formData,
         headers: { 'Content-Type': 'multipart/form-data' }
@@ -316,25 +319,6 @@
       uploadProgressPanel.value = false
     }
   }
-  // const FileUpload = async () => {
-  //   if (true) {
-  //     const formData = new FormData()
-  //     formData.append('excelFile', dataStore.panelData.file)
-  //     let dt: any
-  //
-  //     dt = await dataStore.dataPost(
-  //       `Katilimci/ExcelleYukle/${piyangoStore.selectedLottery}?connectionId=${connectionId}`,
-  //       {
-  //         data: formData,
-  //         headers: { 'Content-Type': 'multipart/form-data' }
-  //       }
-  //     )
-  //     if (dt !== 'errorfalse') {
-  //       piyangoKatilimciStore.refreshPiyangoKatilimciList = true
-  //       piyangoKatilimciStore.katilimciFilePanel = false
-  //     }
-  //   }
-  // }
   const DeleteAllButton = () => {
     dialogStore.CreateDialog({
       title: 'Tüm Katılımcıları Sil',
@@ -346,7 +330,7 @@
         {
           label: 'Tüm katılımcıları Sil',
           type: 'alert',
-          function: () => DeleteAll
+          function: () => DeleteAll()
         }
       ]
     })

src/module/cekilisler/components/display/FormPiyangoBilgileriDisplay.vue

@@ -19,6 +19,7 @@
         </button>
       </div>
     </div>
+    <div class="form-inner-comment waiting-d" v-if="!loaded">Yükleniyor, lütfen bekleyiniz...</div>
     <piyango-bilgileri-display-content v-if="loaded" :isPreview="isPreview" />
   </div>
   <panel-wrapper

src/module/cekilisler/components/form/FormPiyangoBilgileri.vue

@@ -29,6 +29,9 @@
         </button>
       </div>
     </div>
+    <div class="form-inner-comment waiting-d" v-if="!loaded">
+      Yükleniyor, lütfen bekleyiniz...
+    </div>
     <div class="form-part-content" v-if="loaded">
       <lottery-states :piyangoAmac="piyangoStore.lotteryData.amacpiyangoId" />
       <template v-if="!piyangoStore.isNew">
@@ -106,7 +109,7 @@
                 '/uyeler/detay/' +
                 piyangoStore.lotteryData.baglisirketId +
                 '/yetkili-uye/detay/' +
-                piyangoStore.lotteryData.duzenleyenId
+                piyangoStore.lotteryData.duzenleyenId+'/kisi-kurum-bilgileri'
               "
               class="button-c">
               Üyeyi Kontrol Et
@@ -541,7 +544,7 @@
           piyangoStore.lotteryApprove = 0
           piyangoStore.isNew = false
           piyangoStore.ResetLotteryData()
-          router.push('/piyangolar/detay/' + form.id+'/piyango-bilgileri')
+          router.push('/piyangolar/detay/' + form.id + '/piyango-bilgileri')
         } else {
           GetData()
         }

src/module/cekilisler/components/form/FormPiyangoOnayDurum.vue

@@ -82,9 +82,7 @@
     },
     {
       name: 'aciklama',
-      title: 'Açıklama',
+      title: 'Açıklama'
-      sort: true,
-      style: { width: '30%' }
     },
     {
       dosyaUrl: 'aciklama',
@@ -95,7 +93,19 @@
         }
       },
       style: { width: '20%' }
-    }
+    },
+    {
+      name: 'izinSayisi',
+      title: 'İzin Sayısı'
+    },
+    {
+      name: 'izinTarihi',
+      title: 'İzin Tarihi'
+    },
+    {
+      name: 'izinAciklamasi',
+      title: 'İzin Açıklaması'
+    },
   ])
 
   const EditOnay = (d: Record<string, any>) => {

src/module/cekilisler/components/panel/PanelPiyangoDosyaKapamaIkramiye.vue

@@ -9,7 +9,7 @@
     listVal="id"
     v-model="selectedIkramiye"
     :invalidText="
-      piyangoDosyaKapamaValidationStore.ikramiyeInvalidTexts.taahhutEdilenIkramiye
+      piyangoDosyaKapamaValidationStore.ikramiyeInvalidTexts.tahhutEdilenIkramiye
     ">
     <template #activator="data">
       {{
@@ -123,7 +123,7 @@
     piyangoIkramiyeStore.piyangoAllIkramiyeData.forEach((item) => {
       if (
         `${item.cinsi}, ${item.marka}, ${item.model}, (${item.asilTalihliAdedi} adet)` ===
-        piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.taahhutEdilenIkramiye
+        piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.tahhutEdilenIkramiye
       ) {
         selectedIkramiye.value = item.id
       }

src/module/cekilisler/service/signalrService.ts

@@ -1,19 +1,33 @@
 import * as signalR from '@microsoft/signalr'
-import { v4 as uuidv4 } from 'uuid'
 
 let connection: signalR.HubConnection
 let connectionId = ''
 
 export const connectToHub = async () => {
+  console.log('Connecting to SignalR Hub...')
+  // Mevcut bağlantı varsa kapat
+  if (connection && connection.state === signalR.HubConnectionState.Connected) {
+    await connection.stop()
+  }
+
   connection = new signalR.HubConnectionBuilder()
     .withUrl(import.meta.env.VITE_SOCKET_URL, {
-      withCredentials: false // Bu zorunlu, yoksa cookie vs gönderilmez
+      withCredentials: true,
-    }) // backend adresine göre düzenle
+      skipNegotiation: true,  // WebSocket kullanırken negotiation atlanabilir
+      transport: signalR.HttpTransportType.WebSockets
+    })
     .withAutomaticReconnect()
     .build()
 
+  // Eventleri ekle
+  onProgress((data) => console.log('progress', data))
+  onInsertProgress((data) => console.log('insert progress', data))
+  onCompleted((data) => console.log('completed', data))
+  onError((data) => console.log('error', data))
+
   await connection.start()
-  connectionId = connection.connectionId || uuidv4() // SignalR id'si ya da frontend'de de guid üretilebilir
+  connectionId = await connection.invoke<string>('GetConnectionId')
+  console.log('Connected to SignalR Hub with Connection ID:', connectionId)
   return connectionId
 }
 

src/module/cekilisler/stores/piyangoStore.ts

@@ -48,7 +48,7 @@ export const usePiyangoStore = defineStore('piyangoStore', () => {
   ])
 
   const baseLotteryData = reactive<Record<string, any>>({
-    amac:'',
+    amac: '',
     amacpiyangoId: null,
     duzenleyenId: null,
     baslik: '',
@@ -91,13 +91,14 @@ export const usePiyangoStore = defineStore('piyangoStore', () => {
 
   const duzenleyenLink = computed<string | null>(() => {
     if (lotteryData.baglisirketId === null && lotteryData.duzenleyenId !== null)
-      return '/uyeler/detay/' + lotteryData.duzenleyenId
+      return '/uyeler/detay/' + lotteryData.duzenleyenId + '/uye-bilgileri'
     else if (lotteryData.duzenleyenId !== null && lotteryData.baglisirketId !== null)
       return (
         '/uyeler/detay/' +
-        araciUyeData.baglisirketId +
+        lotteryData.baglisirketId +
         '/yetkili-uye/detay/' +
-        lotteryData.duzenleyenId
+        lotteryData.duzenleyenId +
+        '/kisi-kurum-bilgileri'
       )
     else return null
   })
@@ -122,8 +123,8 @@ export const usePiyangoStore = defineStore('piyangoStore', () => {
     Object.assign(lotteryData, baseLotteryData)
     lotteryApprove.value = null
     selectedLottery.value = null
-    lotteryData.kapsamIl.splice(0,lotteryData.kapsamIl.length)
+    lotteryData.kapsamIl.splice(0, lotteryData.kapsamIl.length)
-    lotteryData.kapsamIlce.splice(0,lotteryData.kapsamIlce.length)
+    lotteryData.kapsamIlce.splice(0, lotteryData.kapsamIlce.length)
   }
 
   const ResetLotteryContent = () => {

src/module/cekilisler/validation/piyangoDosyaKapamaValidationStore.ts

@@ -37,6 +37,7 @@ export const usePiyangoDosyaKapamaValidationStore = defineStore(
         'tahhutEdilenIkramiye',
         'Lütfen taahhüt edilen ikramiyeyi seçiniz.'
       )
+
       if (
         validationStore.checkEmpty(
           piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.tahhutEdilenIkramiyeAdet
@@ -52,14 +53,39 @@ export const usePiyangoDosyaKapamaValidationStore = defineStore(
           piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.teslimEdilenIkramiyeAsil
         ) &&
         validationStore.checkEmpty(
-          piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.teslimEdilenIkramiyeAsil
+          piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.teslimEdilenIkramiyeYedek
         )
       ) {
         isIkramiyeFormValid.value = false
         ikramiyeInvalidTexts.teslimEdilenIkramiyeAsil =
-          'En az 1 asil veya yedek talihli adedi girmelisiniz'
+          'Yedek ve asil talihli alanlarının en az biri dolu olmalıdır'
         ikramiyeInvalidTexts.teslimEdilenIkramiyeYedek =
-          'En az 1 asil veya yedek talihli adedi girmelisiniz'
+          'Yedek ve asil talihli alanlarının en az biri dolu olmalıdır'
+      }
+
+      if (
+        !validationStore.checkEmpty(
+          piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.teslimEdilenIkramiyeAsil
+        ) &&
+        !validationStore.checkEmpty(
+          piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.teslimEdilenIkramiyeYedek
+        )
+      ) {
+        if (
+          Number(
+            piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.teslimEdilenIkramiyeAsil
+          ) +
+            Number(
+              piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.teslimEdilenIkramiyeYedek
+            ) !==
+          Number(piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.tahhutEdilenIkramiyeAdet)
+        ) {
+          isIkramiyeFormValid.value = false
+          ikramiyeInvalidTexts.teslimEdilenIkramiyeAsil =
+            'Asil ve yedek talihli toplamları, toplam ikramiye adedi kadar olmalıdır.'
+          ikramiyeInvalidTexts.teslimEdilenIkramiyeYedek =
+            'Asil ve yedek talihli toplamları, toplam ikramiye adedi kadar olmalıdır.'
+        }
       }
 
       validationStore.IsFieldEmpty(
@@ -69,6 +95,20 @@ export const usePiyangoDosyaKapamaValidationStore = defineStore(
         'Alınmayan ikramiye adedi boş olamaz. En az 1 asil veya yedek ikramiye adedi giriniz.'
       )
 
+      if (
+        !validationStore.checkEmpty(
+          piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.alinmayanIkramiye
+        )
+      ) {
+        if (
+          Number(piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.alinmayanIkramiye) < 0
+        ) {
+          isIkramiyeFormValid.value = false
+          ikramiyeInvalidTexts.alinmayanIkramiye =
+            'Teslim edilen asil ve yedek ikramiye toplamları, toplam ikramiye kadar olmalıdır.'
+        }
+      }
+
       isIkramiyeFormValid.value = Object.keys(ikramiyeInvalidTexts).length === 0
       return isIkramiyeFormValid.value
     }

src/module/cekilisler/views/PiyangoListe.vue

@@ -23,7 +23,8 @@
   </AdminLayout>
 </template>
 <script setup lang="ts">
-  import { ref, computed, onBeforeMount } from 'vue'
+  import { ref, computed, onBeforeMount, onMounted } from 'vue'
+  import { useRoute } from 'vue-router'
 
   import AdminLayout from '@/layouts/AdminLayout.vue'
   import { useDateStore } from '@/stores/dateStore'
@@ -39,6 +40,7 @@
   const piyangoServices = usePiyangoServices()
 
   import router from '@/router'
+  const route = useRoute()
 
   const loaded = ref<boolean>(false)
   const apiList = ref<string>('')
@@ -241,4 +243,13 @@
 
     loaded.value = true
   })
+
+  onMounted(() => {
+    // URL query parametrelerini kontrol et ve filtreleri uygula
+    if (route.query.durumId) {
+      // Filtre parametresini ListTableContent bileşenine iletmek için
+      // Bu parametre otomatik olarak ListTableContent tarafından işlenecek
+      console.log('Durum filtresi uygulanıyor:', route.query.durumId)
+    }
+  })
 </script>

src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue

@@ -2,7 +2,7 @@
   <div :class="['form-part']" id="display-bilgi">
     <div class="form-part-title">
       <h4>Piyango Bilgileri</h4>
-      <div class="form-part-title-buttons" v-if="!isPreview">
+      <div class="form-part-title-buttons" v-if="!isPreview && loaded">
         <button
           @click="BasvuruBedeliDialog"
           v-if="
@@ -31,6 +31,7 @@
         </router-link>
       </div>
     </div>
+    <div class="form-inner-comment waiting-d" v-if="!loaded">Yükleniyor, lütfen bekleyiniz...</div>
     <piyango-bilgileri-display-content v-if="loaded" :isPreview="isPreview" />
 
     <!-- İzin Bedeli Modal -->
@@ -162,11 +163,13 @@
   const calculatedKdv = ref<number>(0)
   const calculatedOran = ref<number>(0)
 
-  const calculatedBasvuruKdv = computed<number>(
+  const calculatedBasvuruKdv = computed<number>(() =>
-    () =>
+    muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !== undefined &&
-      (Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) *
+    muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani !== undefined
-        Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) /
+      ? (Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) *
-      100
+          Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) /
+        100
+      : 0
   )
 
   const GetData = async () => {
@@ -215,18 +218,13 @@
   }
   const GetIkramiyeTotalValues = async () => {
     console.log(piyangoStore, 'piyangoStore')
-    let data = await dataStore.dataGet('Ikramiye/Cekilis/' + piyangoStore.selectedLottery)
+    let data = await dataStore.dataGet('Ikramiye/Cekilis/' + piyangoStore.selectedLottery +'?pageNumber=0')
+    //todo:page 0
     if (data !== 'errorfalse') {
       piyangoIkramiyeStore.totalIkramiyeValue = data.toplamdeger
     }
   }
   const BasvuruBedeliDialog = () => {
-    console.log(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli)
-    console.log(calculatedBasvuruKdv.value)
-    console.log(
-      Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) +
-        calculatedBasvuruKdv.value
-    )
     dialogStore.CreateDialog({
       title: 'Başvuru Bedelini Muhasebeleştir',
       id: 'basvurubedelimuhasebelestir',
@@ -234,25 +232,40 @@
                 <tbody>
                   <tr>
                     <td>Başvuru Bedeli:</td>
-                    <td>${globalStore.toTrLocale(
+                    <td>${
-                      muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli
+                      muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !==
-                    )} ₺</td>
+                      undefined
+                        ? globalStore.toTrLocale(
+                            muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli
+                          )
+                        : 0
+                    } ₺</td>
                   </tr>
                   <tr>
                     <td>KDV (%${
                       muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani
                     }):</td>
                     <td>
-                      ${globalStore.toTrLocale(calculatedBasvuruKdv.value)}
+                      ${
+                        calculatedBasvuruKdv.value !== undefined
+                          ? globalStore.toTrLocale(calculatedBasvuruKdv.value)
+                          : 0
+                      }
                     </td>
                   </tr>
                   <tr>
                     <td>Toplam Bedel:</td>
                     <td>
-                      ${globalStore.toTrLocale(
+                      ${
-                        Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) +
+                        muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !==
-                          calculatedBasvuruKdv.value
+                        undefined
-                      )}
+                          ? globalStore.toTrLocale(
+                              Number(
+                                muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli
+                              ) + calculatedBasvuruKdv.value
+                            )
+                          : 0
+                      }
                     </td>
                   </tr>
                 </tbody>
@@ -262,12 +275,13 @@
         {
           label: 'Başvuru Bedelini Muhasebeleştir',
           type: 'alert',
-          function: () => BasvuruBedeliMuhasebelestir
+          function: () => BasvuruBedeliMuhasebelestir()
         }
       ]
     })
   }
   const BasvuruBedeliMuhasebelestir = async () => {
+    console.log('basvuru bedeli muhasebelestir')
     let data = await dataStore.dataGet(
       'MuhasebeSettings/BasvuruBedeli/' + piyangoStore.selectedLottery
     )

src/module/site-yonetimi/views/MenuYonetimi.vue

@@ -12,6 +12,7 @@
               <div class="button-c button-save" @click="SaveMenu">Kaydet</div>
             </div>
           </div>
+          <div class="form-inner-comment waiting-d" v-if="!loaded">Yükleniyor, lütfen bekleyiniz...</div>
           <div class="form-part-content">
             <template v-if="loaded">
               <template v-if="siteManagementMenuStore.menuContentList.length > 0">

src/module/uyeler/components/form/FormUyeBilgileri.vue

@@ -485,7 +485,7 @@
             '/uyeler/detay/' +
               route.params.uyeId +
               '/yetkili-uye/detay/' +
-              register.user.id
+              register.user.id+'/kisi-kurum-bilgileri'
           )
           isNew.value = false
         }else{

src/module/uyeler/routes/uye-yetkili.ts

@@ -8,7 +8,7 @@ export default [
       params: {
         uyeId: to.params.uyeId,
         altUyeId: to.params.altUyeId,
-        tabid: 'piyango-bilgileri'
+        tabid: 'kisi-kurum-bilgileri'
       }
     })
   },

src/module/uyeler/views/UyelerListe.vue

@@ -1,6 +1,9 @@
 <template>
   <AdminLayout>
     <Breadcrumb current-page-text="Üyeler Listesi" go="/" />
+    <div class="form-inner-comment waiting-d" v-if="!loaded">
+      Yükleniyor, lütfen bekleyiniz...
+    </div>
     <section class="section-list">
       <list-table-content
         v-if="loaded"
@@ -122,7 +125,7 @@
   ])
   const rwAction = (row: any) => {
     if (usersStore.isPanelUser) globalStore.selCustomerType = row.basvuruTipId
-    router.push('detay/' + row.id+'/uye-bilgileri')
+    router.push('detay/' + row.id + '/uye-bilgileri')
   }
 
   onBeforeMount(async () => {

src/router/index.ts

@@ -39,7 +39,7 @@ router.beforeEach((to, from) => {
   const usersStore = useUsersStore()
 
   if (to.meta.authRequired && !usersStore.userIsAuth && from.name !== 'Login') {
-    router.push('/login')
+    router.push('/giris')
   }
 })
 

src/views/Dashboard.vue

@@ -10,7 +10,8 @@
       iconBack="waiting"
       :tableData="onayBekleyenPiyango"
       lineRoute="piyangolar/detay/"
-      lineRouteKey="id" />
+      lineRouteKey="id"
+      :filterParams="{ durumId: 0 }" />
     <dash-piyango-liste
       v-if="loaded"
       title="İtiraz/Şikayet Edilen Piyangolar"
@@ -21,7 +22,8 @@
       iconBack="alert"
       :tableData="itirazEdilenPiyango"
       lineRoute="piyangolar/detay/"
-      lineRouteKey="id" />
+      lineRouteKey="id"
+      :filterParams="{ durumId: 1 }" />
 
     <dash-piyango-liste
       v-if="loaded"
@@ -33,7 +35,8 @@
       iconBack="next"
       :tableData="yaklasanPiyango"
       lineRoute="piyangolar/detay/"
-      lineRouteKey="id" />
+      lineRouteKey="id"
+       :filterParams="{ baslangicTarihi: '>' + new Date().toISOString().split('T')[0] }"/>
 
     <dash-piyango-liste
       v-if="loaded"
@@ -45,7 +48,8 @@
       iconBack="ok"
       :tableData="bitenPiyango"
       lineRoute="piyangolar/detay/"
-      lineRouteKey="id" />
+      lineRouteKey="id"
+       :filterParams="{ bitisTarihi: '<' + new Date().toISOString().split('T')[0] }"  />
   </AdminLayout>
 </template>
 <script setup lang="ts">