- FormDisplay size props eklendi

- PiyangoId alanları eklendi

src/components/global/DataTable.vue

@@ -80,11 +80,13 @@
                   :name="'dataCell' + j"
                   :cellData="CellData(dataRow, dataCell.name)"
                   :cellIndex="j">
-                  {{
+                  <div class="table-inner-content">
-                    dataCell.compute !== undefined
+                    {{
-                      ? dataCell.compute(dataRow)
+                      dataCell.compute !== undefined
-                      : dataRow[dataCell.name]
+                        ? dataCell.compute(dataRow)
-                  }}
+                        : dataRow[dataCell.name]
+                    }}
+                  </div>
                 </slot>
               </td>
               <td v-else v-html="dataCell.computeHtml(dataRow)"></td>
@@ -275,4 +277,13 @@
     top: 0;
     right: 0;
   }
+  .table-inner-content {
+    max-height: 400px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 20;
+    line-clamp: 20;
+    -webkit-box-orient: vertical;
+    display: -webkit-box;
+  }
 </style>

src/components/global/FormDisplay.vue

@@ -14,7 +14,9 @@
         </span>
         <template v-if="modelText !== undefined && modelText !== ''">
           <template v-if="typeof modelText === 'string'">
-            <span>{{ price ? globalStore.toTrLocale(modelText) : modelText }}</span>
+            <span :class="[size ? 'form-item-size form-item-size-' + size : '']">
+              {{ price ? globalStore.toTrLocale(modelText) : modelText }}
+            </span>
           </template>
           <template v-if="typeof modelText === 'object'">
             <ul>
@@ -25,7 +27,9 @@
           </template>
         </template>
         <template v-else>
-          <span>{{ price ? globalStore.toTrLocale(localValue) : localValue }}</span>
+          <span :class="[size ? 'form-item-size form-item-size-' + size : '']">
+            {{ price ? globalStore.toTrLocale(localValue) : localValue }}
+          </span>
         </template>
         <span
           class="form-item-alert"
@@ -64,6 +68,7 @@
     modelText?: any
     invalidText?: string
     price?: boolean
+    size?: number | string
   }
   const props = withDefaults(defineProps<Props>(), {
     half: false,
@@ -71,13 +76,23 @@
   })
   const localValue = ref<any>(props.modelValue)
 
-  if (props.type === 'date' && props.modelValue !== null && props.modelValue !== undefined && props.modelValue !== '')
+  if (
+    props.type === 'date' &&
+    props.modelValue !== null &&
+    props.modelValue !== undefined &&
+    props.modelValue !== ''
+  )
     localValue.value = dateStore.dateFormat({
       date: props.modelValue as Date,
       pattern: 'dd-mm-yy'
     })
 
-  if (props.type === 'datetime' && props.modelValue !== null && props.modelValue !== undefined && props.modelValue !== '')
+  if (
+    props.type === 'datetime' &&
+    props.modelValue !== null &&
+    props.modelValue !== undefined &&
+    props.modelValue !== ''
+  )
     localValue.value = dateStore.dateFormat({
       date: props.modelValue as Date,
       pattern: 'dd-mm-yy-t'
@@ -108,3 +123,14 @@
     }
   )
 </script>
+<style scoped>
+  .form-item-size {
+    font-weight: 600;
+  }
+  .form-item-size-1 {
+    font-size: 1.2em;
+  }
+  .form-item-size-2 {
+    font-size: 1.5em;
+  }
+</style>

src/init/axios-init.ts

@@ -2,8 +2,7 @@ import axios from 'axios'
 import { useUsersStore } from '@/stores/usersStore'
 import router from '@/router'
 
-//axios.defaults.baseURL = 'https://panelapi.cekilisevi.gov.tr/'
+axios.defaults.baseURL = 'https://panelapi.cekilisevi.gov.tr/'
-axios.defaults.baseURL = 'https://mpiapi.beyaz.net/'
 //axios.defaults.timeout = 2000;
 axios.defaults.headers['Content-Type'] = 'application/json; charset=utf-8'
 import { useDataStore } from '@/stores/dataStore'

src/layouts/admin-inc/Header.vue

@@ -8,7 +8,7 @@
       </i>
       <a href="/" class="logo-header">
         <img
-            src="@/assets/images/cekilisevi-logo-1.png"
+            src="@/assets/images/cekilisevi-logo-n.png"
             alt="MPI Çekiliş Evi"/>
       </a>
     </div>

src/module/auth/views/ForgotPassword.vue

@@ -4,7 +4,7 @@
       <div class="login-header">
         <div class="logo-header">
           <img
-            src="@/assets/images/cekilisevi-logo-1.png"
+            src="@/assets/images/cekilisevi-logo-n.png"
             alt="MPI Çekiliş Evi"/>
         </div>
         <h1>Şifremi Unuttum</h1>

src/module/auth/views/Login.vue

@@ -4,7 +4,7 @@
       <div class="login-header">
         <div class="logo-header">
           <img
-            src="@/assets/images/cekilisevi-logo-1.png"
+            src="@/assets/images/cekilisevi-logo-n.png"
             alt="MPI Çekiliş Evi"/>
         </div>
         <h1>Giriş Yap</h1>

src/module/auth/views/Register.vue

@@ -3,7 +3,7 @@
     <section class="section-login">
       <div class="login-header">
         <div class="logo-header">
-          <img src="@/assets/images/cekilisevi-logo-1.png" alt="MPI Çekiliş Evi" />
+          <img src="@/assets/images/cekilisevi-logo-n.png" alt="MPI Çekiliş Evi" />
         </div>
         <h1>Üye Ol</h1>
       </div>

src/module/cekilisler/components/content/PiyangoBilgileriDisplayContent.vue

@@ -3,6 +3,10 @@
     <lottery-states
       :piyangoAmac="piyangoStore.lotteryData.amacpiyangoId"
       v-if="!isPreview" />
+    <form-display
+      v-model="piyangoStore.lotteryData.piyangoId"
+      label="Piyango ID"
+      size="1" />
     <template
       v-if="
         usersStore.isPanelUser &&

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

@@ -23,6 +23,13 @@
   <strong style="font-size: 10pt; margin-bottom: 12px">
     PİYANGO İLE İLGİLİ BİLGİLER
   </strong>
+  <br />
+  <br />
+  <strong style="font-size: 10pt; margin-bottom: 12px">
+    PİYANGO ID: {{ piyangoStore.lotteryData.piyangoId }}
+  </strong>
+  <br />
+  <br />
   <table
     cellspacing="0"
     class="table-no-line"

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

@@ -12,6 +12,12 @@
     Bahisler ve Oyunlar Dairesi Başkanlığına
   </strong>
   <br />
+  <br />
+  <strong style="font-size: 10pt; margin-bottom: 12px">
+    PİYANGO ID: {{ piyangoStore.lotteryData.piyangoId }}
+  </strong>
+  <br />
+  <br />
   <table
     cellspacing="0"
     class="table-no-line"

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

@@ -31,7 +31,17 @@
     </div>
     <div class="form-part-content" v-if="loaded">
       <lottery-states :piyangoAmac="piyangoStore.lotteryData.amacpiyangoId" />
-
+      <template
+        v-if="
+          !piyangoStore.isNew &&
+          piyangoStore.lotteryData.piyangoId !== undefined &&
+          piyangoStore.lotteryData.piyangoId !== null
+        ">
+        <form-display
+          v-model="piyangoStore.lotteryData.piyangoId"
+          label="Piyango ID"
+          size="1" />
+      </template>
       <form-input
         modelKey="cekilisBaslik"
         v-model="piyangoStore.lotteryData.baslik"
@@ -602,7 +612,7 @@
 
       let list = await dataStore.dataGet('Auth/userbyuserChildList/' + id)
 
-      childUsers.value = list.data.filter((p:Record<string,any>) => {
+      childUsers.value = list.data.filter((p: Record<string, any>) => {
         return p.islemTipId === 4 || p.islemTipi === 'Üyelik Onaylandı'
       })
 

src/module/cekilisler/views/PiyangoListe.vue

@@ -72,6 +72,12 @@
     }
 
     header.push(
+      {
+        name: 'piyangoId',
+        title: 'Piyango ID',
+        sort: true,
+        style: { width: '10%' }
+      },
       {
         name: 'baslik',
         title: 'Başlık',
@@ -101,7 +107,8 @@
           type: 'date',
           range: true
         }
-      })
+      }
+    )
 
     if (usersStore.isVakifDernek || usersStore.isPanelUser) {
       header.push({
@@ -146,7 +153,7 @@
           }
         }
       )
-    }    
+    }
 
     header.push(
       {

src/module/muhasebe/views/MuhasebePiyangoListesi.vue

@@ -54,6 +54,12 @@
     }
 
     header.push(
+      {
+        name: 'piyangoId',
+        title: 'Piyango ID',
+        sort: true,
+        style: { width: '10%' }
+      },
       {
         name: 'baslik',
         title: 'Başlık',

src/stores/dataStore.ts

@@ -40,7 +40,7 @@ export const useDataStore = defineStore('dataStore', () => {
       }
 
       const response = await axios.get(apiBase.value + api, sendData)
-      console.log('response --', api, response)
+      //console.log('response --', api, response)
 
       if (data.full !== undefined && data.full) {
         return response
@@ -49,7 +49,7 @@ export const useDataStore = defineStore('dataStore', () => {
       }
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
-      console.error('Hata oluştu -:', error)
+      //console.error('Hata oluştu -:', error)
       return 'errorfalse'
     }
   }
@@ -86,7 +86,7 @@ export const useDataStore = defineStore('dataStore', () => {
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
 
-      console.error('Hata oluştu:', error)
+      //console.error('Hata oluştu:', error)
       return Promise.resolve('errorfalse')
     }
   }
@@ -122,7 +122,7 @@ export const useDataStore = defineStore('dataStore', () => {
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
 
-      console.error('Hata oluştu:', error)
+      //console.error('Hata oluştu:', error)
       return Promise.resolve('errorfalse')
     }
   }
@@ -156,7 +156,7 @@ export const useDataStore = defineStore('dataStore', () => {
       }
     } catch (error: any) {
       CheckApiError(error.response.status, error.response.data)
-      console.error('Hata oluştu:', error)
+      //console.error('Hata oluştu:', error)
       return Promise.resolve('errorfalse')
     }
   }