bug fix in cost list and use expanded row

hesabixCore/src/Controller/CostController.php

@@ -166,179 +166,180 @@ class CostController extends AbstractController
 
     #[Route('/api/cost/list/search', name: 'app_cost_list_search', methods: ['POST'])]
     public function searchCostList(
-     Request $request,
-     Access $access,
-     EntityManagerInterface $entityManager,
-     Jdate $jdate
+        Request $request,
+        Access $access,
+        EntityManagerInterface $entityManager,
+        Jdate $jdate
     ): JsonResponse {
-     $acc = $access->hasRole('cost');
-     if (!$acc) {
-     throw $this->createAccessDeniedException();
-     }
+        $acc = $access->hasRole('cost');
+        if (!$acc) {
+            throw $this->createAccessDeniedException();
+        }
 
-     $params = json_decode($request->getContent(), true) ?? [];
+        $params = json_decode($request->getContent(), true) ?? [];
 
-     // پارامترهای ورودی
-     $filters = $params['filters'] ?? [];
-     $pagination = $params['pagination'] ?? ['page' => 1, 'limit' => 10];
-     $sort = $params['sort'] ?? ['sortBy' => 'id', 'sortDesc' => true];
-     $type = $params['type'] ?? 'cost';
+        // پارامترهای ورودی
+        $filters = $params['filters'] ?? [];
+        $pagination = $params['pagination'] ?? ['page' => 1, 'limit' => 10];
+        $sort = $params['sort'] ?? ['sortBy' => 'id', 'sortDesc' => true];
+        $type = $params['type'] ?? 'cost';
 
-     // تنظیم پارامترهای صفحه‌بندی
-     $page = max(1, $pagination['page'] ?? 1);
-     $limit = max(1, min(100, $pagination['limit'] ?? 10));
+        // تنظیم پارامترهای صفحه‌بندی
+        $page = max(1, $pagination['page'] ?? 1);
+        $limit = max(1, min(100, $pagination['limit'] ?? 10));
 
-     // ساخت کوئری پایه
-     $queryBuilder = $entityManager->createQueryBuilder()
-     ->select('DISTINCT d.id, d.dateSubmit, d.date, d.type, d.code, d.des, d.amount')
-     ->addSelect('u.fullName as submitter')
-     ->from('App\Entity\HesabdariDoc', 'd')
-     ->leftJoin('d.submitter', 'u')
-     ->where('d.bid = :bid')
-     ->andWhere('d.year = :year')
-     ->andWhere('d.type = :type')
-     ->andWhere('d.money = :money')
-     ->setParameter('bid', $acc['bid'])
-     ->setParameter('year', $acc['year'])
-     ->setParameter('type', $type)
-     ->setParameter('money', $acc['money']);
+        // ساخت کوئری پایه
+        $queryBuilder = $entityManager->createQueryBuilder()
+            ->select('DISTINCT d.id, d.dateSubmit, d.date, d.type, d.code, d.des, d.amount')
+            ->addSelect('u.fullName as submitter')
+            ->from('App\Entity\HesabdariDoc', 'd')
+            ->leftJoin('d.submitter', 'u')
+            ->where('d.bid = :bid')
+            ->andWhere('d.year = :year')
+            ->andWhere('d.type = :type')
+            ->andWhere('d.money = :money')
+            ->setParameter('bid', $acc['bid'])
+            ->setParameter('year', $acc['year'])
+            ->setParameter('type', $type)
+            ->setParameter('money', $acc['money']);
 
-     // اعمال فیلترها
-     if (!empty($filters)) {
-     // جستجوی متنی
-     if (isset($filters['search'])) {
-     $searchValue = is_array($filters['search']) ? $filters['search']['value'] : $filters['search'];
-     $queryBuilder->leftJoin('d.hesabdariRows', 'r')
-     ->leftJoin('r.person', 'p')
-     ->leftJoin('r.ref', 't')
-     ->andWhere(
-     $queryBuilder->expr()->orX(
-     'd.code LIKE :search',
-     'd.des LIKE :search',
-     'd.date LIKE :search',
-     'd.amount LIKE :search',
-     'p.nikename LIKE :search',
-     't.name LIKE :search'
-     )
-     )
-     ->setParameter('search', "%{$searchValue}%");
-     }
+        // اعمال فیلترها
+        if (!empty($filters)) {
+            // جستجوی متنی
+            if (isset($filters['search'])) {
+                $searchValue = is_array($filters['search']) ? $filters['search']['value'] : $filters['search'];
+                $queryBuilder->leftJoin('d.hesabdariRows', 'r')
+                    ->leftJoin('r.person', 'p')
+                    ->leftJoin('r.ref', 't')
+                    ->andWhere(
+                        $queryBuilder->expr()->orX(
+                            'd.code LIKE :search',
+                            'd.des LIKE :search',
+                            'd.date LIKE :search',
+                            'd.amount LIKE :search',
+                            'p.nikename LIKE :search',
+                            't.name LIKE :search'
+                        )
+                    )
+                    ->setParameter('search', "%{$searchValue}%");
+            }
 
-     // فیلتر زمانی
-     if (isset($filters['timeFilter'])) {
-     $today = $jdate->jdate('Y/m/d', time());
-     switch ($filters['timeFilter']) {
-     case 'today':
-     $queryBuilder->andWhere('d.date = :today')
-     ->setParameter('today', $today);
-     break;
-     case 'week':
-     $weekStart = $jdate->jdate('Y/m/d', strtotime('-6 days'));
-     $queryBuilder->andWhere('d.date BETWEEN :weekStart AND :today')
-     ->setParameter('weekStart', $weekStart)
-     ->setParameter('today', $today);
-     break;
-     case 'month':
-     $monthStart = $jdate->jdate('Y/m/01', time());
-     $queryBuilder->andWhere('d.date BETWEEN :monthStart AND :today')
-     ->setParameter('monthStart', $monthStart)
-     ->setParameter('today', $today);
-     break;
-     case 'custom':
-     if (isset($filters['dateFrom']) && isset($filters['dateTo'])) {
-     $queryBuilder->andWhere('d.date BETWEEN :dateFrom AND :dateTo')
-     ->setParameter('dateFrom', $filters['dateFrom'])
-     ->setParameter('dateTo', $filters['dateTo']);
-     }
-     break;
-     case 'all':
-     default:
-     // بدون فیلتر زمانی اضافه
-     break;
-     }
-     }
+            // فیلتر زمانی
+            if (isset($filters['timeFilter'])) {
+                $today = $jdate->jdate('Y/m/d', time());
+                switch ($filters['timeFilter']) {
+                    case 'today':
+                        $queryBuilder->andWhere('d.date = :today')
+                            ->setParameter('today', $today);
+                        break;
+                    case 'week':
+                        $weekStart = $jdate->jdate('Y/m/d', strtotime('-6 days'));
+                        $queryBuilder->andWhere('d.date BETWEEN :weekStart AND :today')
+                            ->setParameter('weekStart', $weekStart)
+                            ->setParameter('today', $today);
+                        break;
+                    case 'month':
+                        $monthStart = $jdate->jdate('Y/m/01', time());
+                        $queryBuilder->andWhere('d.date BETWEEN :monthStart AND :today')
+                            ->setParameter('monthStart', $monthStart)
+                            ->setParameter('today', $today);
+                        break;
+                    case 'custom':
+                        if (isset($filters['dateFrom']) && isset($filters['dateTo'])) {
+                            $queryBuilder->andWhere('d.date BETWEEN :dateFrom AND :dateTo')
+                                ->setParameter('dateFrom', $filters['dateFrom'])
+                                ->setParameter('dateTo', $filters['dateTo']);
+                        }
+                        break;
+                    case 'all':
+                    default:
+                        // بدون فیلتر زمانی اضافه
+                        break;
+                }
+            }
 
-     if (isset($filters['amount'])) {
-     $queryBuilder->andWhere('d.amount = :amount')
-     ->setParameter('amount', $filters['amount']);
-     }
-     }
+            if (isset($filters['amount'])) {
+                $queryBuilder->andWhere('d.amount = :amount')
+                    ->setParameter('amount', $filters['amount']);
+            }
+        }
 
-     // اعمال مرتب‌سازی
-     $sortField = is_array($sort['sortBy']) ? ($sort['sortBy']['key'] ?? 'id') : ($sort['sortBy'] ?? 'id');
-     $sortDirection = ($sort['sortDesc'] ?? true) ? 'DESC' : 'ASC';
-     $queryBuilder->orderBy("d.$sortField", $sortDirection);
+        // اعمال مرتب‌سازی
+        $sortField = is_array($sort['sortBy']) ? ($sort['sortBy']['key'] ?? 'id') : ($sort['sortBy'] ?? 'id');
+        $sortDirection = ($sort['sortDesc'] ?? true) ? 'DESC' : 'ASC';
+        $queryBuilder->orderBy("d.$sortField", $sortDirection);
 
-     // محاسبه تعداد کل نتایج
-     $totalItemsQuery = clone $queryBuilder;
-     $totalItems = $totalItemsQuery->select('COUNT(DISTINCT d.id)')
-     ->getQuery()
-     ->getSingleScalarResult();
+        // محاسبه تعداد کل نتایج
+        $totalItemsQuery = clone $queryBuilder;
+        $totalItems = $totalItemsQuery->select('COUNT(DISTINCT d.id)')
+            ->getQuery()
+            ->getSingleScalarResult();
 
-     // اعمال صفحه‌بندی
-     $queryBuilder->setFirstResult(($page - 1) * $limit)
-     ->setMaxResults($limit);
+        // اعمال صفحه‌بندی
+        $queryBuilder->setFirstResult(($page - 1) * $limit)
+            ->setMaxResults($limit);
 
-     $docs = $queryBuilder->getQuery()->getArrayResult();
+        $docs = $queryBuilder->getQuery()->getArrayResult();
 
-     $dataTemp = [];
-     foreach ($docs as $doc) {
-     $item = [
-     'id' => $doc['id'],
-     'dateSubmit' => $doc['dateSubmit'],
-     'date' => $doc['date'],
-     'type' => $doc['type'],
-     'code' => $doc['code'],
-     'des' => $doc['des'],
-     'amount' => $doc['amount'],
-     'submitter' => $doc['submitter'],
-     ];
+        $dataTemp = [];
+        foreach ($docs as $doc) {
+            $item = [
+                'id' => $doc['id'],
+                'dateSubmit' => $doc['dateSubmit'],
+                'date' => $doc['date'],
+                'type' => $doc['type'],
+                'code' => $doc['code'],
+                'des' => $doc['des'],
+                'amount' => $doc['amount'],
+                'submitter' => $doc['submitter'],
+            ];
 
-     // دریافت اطلاعات مرکز هزینه و مبلغ
-     $costDetails = $entityManager->createQueryBuilder()
-     ->select('t.name as center_name, r.bd as amount')
-     ->from('App\Entity\HesabdariRow', 'r')
-     ->join('r.ref', 't')
-     ->where('r.doc = :docId')
-     ->andWhere('r.bd != 0')
-     ->setParameter('docId', $doc['id'])
-     ->getQuery()
-     ->getResult();
+            // دریافت اطلاعات مرکز هزینه و مبلغ
+            $costDetails = $entityManager->createQueryBuilder()
+                ->select('t.name as center_name, r.bd as amount, r.des as des')
+                ->from('App\Entity\HesabdariRow', 'r')
+                ->join('r.ref', 't')
+                ->where('r.doc = :docId')
+                ->andWhere('r.bd != 0')
+                ->setParameter('docId', $doc['id'])
+                ->getQuery()
+                ->getResult();
 
-     $item['costCenters'] = array_map(function ($detail) {
-     return [
-     'name' => $detail['center_name'],
-     'amount' => (int) $detail['amount'],
-     ];
-     }, $costDetails);
+            $item['costCenters'] = array_map(function ($detail) {
+                return [
+                    'name' => $detail['center_name'],
+                    'amount' => (int) $detail['amount'],
+                    'des' => $detail['des'],
+                ];
+            }, $costDetails);
 
-     // دریافت اطلاعات شخص مرتبط
-     $personInfo = $entityManager->createQueryBuilder()
-     ->select('p.id, p.nikename, p.code')
-     ->from('App\Entity\HesabdariRow', 'r')
-     ->join('r.person', 'p')
-     ->where('r.doc = :docId')
-     ->andWhere('r.person IS NOT NULL')
-     ->setParameter('docId', $doc['id'])
-     ->setMaxResults(1 )
-     ->getQuery()
-     ->getOneOrNullResult();
+            // دریافت اطلاعات شخص مرتبط
+            $personInfo = $entityManager->createQueryBuilder()
+                ->select('p.id, p.nikename, p.code')
+                ->from('App\Entity\HesabdariRow', 'r')
+                ->join('r.person', 'p')
+                ->where('r.doc = :docId')
+                ->andWhere('r.person IS NOT NULL')
+                ->setParameter('docId', $doc['id'])
+                ->setMaxResults(1)
+                ->getQuery()
+                ->getOneOrNullResult();
 
-     $item['person'] = $personInfo ? [
-     'id' => $personInfo['id'],
-     'nikename' => $personInfo['nikename'],
-     'code' => $personInfo['code'],
-     ] : null;
+            $item['person'] = $personInfo ? [
+                'id' => $personInfo['id'],
+                'nikename' => $personInfo['nikename'],
+                'code' => $personInfo['code'],
+            ] : null;
 
-     $dataTemp[] = $item;
-     }
+            $dataTemp[] = $item;
+        }
 
-     return $this->json([
-     'items' => $dataTemp,
-     'total' => (int) $totalItems,
-     'page' => $page,
-     'limit' => $limit,
-     ]);
+        return $this->json([
+            'items' => $dataTemp,
+            'total' => (int) $totalItems,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
     }
 
     #[Route('/api/costs/list/print', name: 'app_costs_list_print')]

webUI/src/i18n/fa_lang.ts

@@ -267,6 +267,8 @@ const fa_lang = {
     count: "تعداد",
   },
   dialog: {
+    acc_price: 'مبلغ',
+    des: 'شرح',
     warning: 'هشدار',
     column_settings: 'ستون‌های جدول',
     all: 'همه موارد',

webUI/src/views/acc/costs/list.vue

@@ -103,8 +103,8 @@
   </v-text-field>
 
   <v-data-table-server :headers="headers" :items="items" :loading="loading" :items-length="totalItems"
-    v-model:options="serverOptions" @update:options="fetchData" item-value="code" class="elevation-1 data-table-wrapper"
-    :header-props="{ class: 'custom-header' }">
+    v-model:options="serverOptions" v-model:expanded="expanded" @update:options="fetchData" item-value="code"
+    class="elevation-1 data-table-wrapper" :header-props="{ class: 'custom-header' }" show-expand>
     <template #header.checkbox>
       <v-checkbox :model-value="isAllSelected" @change="toggleSelectAll" hide-details density="compact" />
     </template>
@@ -143,25 +143,66 @@
       {{ $filters.formatNumber(item.amount) }}
     </template>
 
-    <template #item.costCenter="{ item }">
-      {{item.costCenters.map(center => center.name).join(', ') || '—'}}
+    <template #expanded-row="{ columns, item }">
+      <tr>
+        <td :colspan="columns.length" class="expanded-row">
+          <v-container>
+            <v-row>
+              <v-col cols="12">
+                <h4>مراکز هزینه</h4>
+                <v-list dense>
+                  <v-list-item v-for="(center, index) in item.costCenters" :key="index">
+                    <v-list-item-title>
+                      {{ center.name }}
+                      {{ $t('dialog.acc_price') }} : {{ this.$filters.formatNumber(center.amount) }}
+                      {{ $t('dialog.des') }} : {{ center.des }}
+                    </v-list-item-title>
+                  </v-list-item>
+                  <v-list-item v-if="!item.costCenters || item.costCenters.length === 0">
+                    <v-list-item-title>—</v-list-item-title>
+                  </v-list-item>
+                </v-list>
+              </v-col>
+            </v-row>
+          </v-container>
+        </td>
+      </tr>
     </template>
   </v-data-table-server>
+  <v-container fluid class="pa-0 ma-0 my-3">
+    <v-card
+      class="rounded border-start border-success border-3"
+      elevation="2"
+      link
+      href="javascript:void(0)"
+    >
+      <v-card-text class="bg-body-light pa-4">
+        <v-row>
+          <v-col cols="12" sm="6">
+            <span class="text-dark">
+              <v-icon icon="mdi-format-list-bulleted" size="small" class="me-1" />
+              مبلغ کل:
+            </span>
+            <span class="text-primary">
+              {{ $filters.formatNumber(totalCost) }}
+              {{ $filters.getActiveMoney().shortName }}
+            </span>
+          </v-col>
 
-  <v-row class="mt-4 pa-4">
-    <v-col cols="6">
-      <v-card flat>
-        <v-card-title>جمع کل هزینه‌ها</v-card-title>
-        <v-card-text>{{ $filters.formatNumber(totalCost) }}</v-card-text>
-      </v-card>
-    </v-col>
-    <v-col cols="6">
-      <v-card flat>
-        <v-card-title>جمع موارد انتخاب‌شده</v-card-title>
-        <v-card-text>{{ $filters.formatNumber(selectedCost) }}</v-card-text>
-      </v-card>
-    </v-col>
-  </v-row>
+          <v-col cols="12" sm="6">
+            <span class="text-dark">
+              <v-icon icon="mdi-format-list-checks" size="small" class="me-1" />
+              جمع مبلغ موارد انتخابی:
+            </span>
+            <span class="text-primary">
+              {{ $filters.formatNumber(selectedCost) }}
+              {{ $filters.getActiveMoney().shortName }}
+            </span>
+          </v-col>
+        </v-row>
+      </v-card-text>
+    </v-card>
+  </v-container>
 </template>
 
 <script setup>
@@ -182,8 +223,9 @@ const selectedItems = ref(new Set());
 const totalItems = ref(0);
 const searchQuery = ref('');
 const timeFilter = ref('all');
+const expanded = ref([]); // برای مدیریت ردیف‌های گسترش‌یافته
 
-// فیلترهای زمانی (بدون بازه دلخواه)
+// فیلترهای زمانی
 const timeFilters = ref([
   { label: 'امروز', value: 'today', checked: false },
   { label: 'این هفته', value: 'week', checked: false },
@@ -191,13 +233,12 @@ const timeFilters = ref([
   { label: 'همه', value: 'all', checked: true },
 ]);
 
-// تعریف ستون‌های جدول
+// تعریف ستون‌های جدول (ستون costCenter از هدرها حذف شده)
 const headers = ref([
   { title: '', key: 'checkbox', sortable: false, width: '50', align: 'center' },
   { title: 'ردیف', key: 'index', align: 'center', sortable: false, width: '70' },
   { title: 'عملیات', key: 'operation', align: 'center', sortable: false, width: '100' },
   { title: 'کد', key: 'code', align: 'center', sortable: true },
-  { title: 'مرکز هزینه', key: 'costCenter', align: 'center', sortable: false },
   { title: 'مبلغ', key: 'amount', align: 'center', sortable: true },
   { title: 'تاریخ', key: 'date', align: 'center', sortable: true },
   { title: 'شرح', key: 'des', align: 'center', sortable: true },
@@ -512,4 +553,9 @@ onMounted(() => {
   margin-right: 0;
   margin-left: 0;
 }
+
+.expanded-row {
+  background-color: #f5f5f5;
+  padding: 10px;
+}
 </style>

webUI/src/views/acc/incomes/list.vue

@@ -20,14 +20,14 @@
               <input v-model="searchValue" class="form-control" type="text" placeholder="جست و جو ...">
             </div>
           </div>
-          <EasyDataTable table-class-name="customize-table" v-model:items-selected="itemsSelected" show-index alternating :search-value="searchValue"
-            :headers="headers" :items="items" theme-color="#1d90ff" header-text-direction="center"
-            body-text-direction="center" rowsPerPageMessage="تعداد سطر" emptyMessage="اطلاعاتی برای نمایش وجود ندارد"
-            rowsOfPageSeparatorMessage="از" :loading="loading">
+          <EasyDataTable table-class-name="customize-table" v-model:items-selected="itemsSelected" show-index
+            alternating :search-value="searchValue" :headers="headers" :items="items" theme-color="#1d90ff"
+            header-text-direction="center" body-text-direction="center" rowsPerPageMessage="تعداد سطر"
+            emptyMessage="اطلاعاتی برای نمایش وجود ندارد" rowsOfPageSeparatorMessage="از" :loading="loading">
             <template #item-operation="{ code }">
               <div class="dropdown-center">
-                <button aria-expanded="false" aria-haspopup="true" class="btn btn-sm btn-link"
-                  data-bs-toggle="dropdown" id="dropdown-align-center-alt-primary" type="button">
+                <button aria-expanded="false" aria-haspopup="true" class="btn btn-sm btn-link" data-bs-toggle="dropdown"
+                  id="dropdown-align-center-alt-primary" type="button">
                   <i class="fa-solid fa-ellipsis"></i>
                 </button>
                 <div aria-labelledby="dropdown-align-center-outline-primary" class="dropdown-menu dropdown-menu-end"
@@ -52,36 +52,35 @@
               </div>
             </template>
           </EasyDataTable>
-          <div class="container-fluid p-0 mx-0 my-3">
-            <a class="block block-rounded block-link-shadow border-start border-success border-3"
-              href="javascript:void(0)">
-              <div class="block-content block-content-full block-content-sm bg-body-light">
-                <div class="row">
-                  <div class="col-sm-6 com-md-6">
+          <v-container fluid class="pa-0 ma-0 my-3">
+            <v-card class="rounded border-start border-success border-3" elevation="2" link href="javascript:void(0)">
+              <v-card-text class="bg-body-light pa-4">
+                <v-row>
+                  <v-col cols="12" sm="6">
                     <span class="text-dark">
-                      <i class="fa fa-list-dots"></i>
+                      <v-icon icon="mdi-format-list-bulleted" size="small" class="me-1" />
                       مبلغ کل:
                     </span>
                     <span class="text-primary">
-                      {{ $filters.formatNumber(this.sumTotal) }}
+                      {{ $filters.formatNumber(sumTotal) }}
                       {{ $filters.getActiveMoney().shortName }}
                     </span>
-                  </div>
+                  </v-col>
 
-                  <div class="col-sm-6 com-md-6">
+                  <v-col cols="12" sm="6">
                     <span class="text-dark">
-                      <i class="fa fa-list-check"></i>
+                      <v-icon icon="mdi-format-list-checks" size="small" class="me-1" />
                       جمع مبلغ موارد انتخابی:
                     </span>
                     <span class="text-primary">
-                      {{ $filters.formatNumber(this.sumSelected) }}
+                      {{ $filters.formatNumber(sumSelected) }}
                       {{ $filters.getActiveMoney().shortName }}
                     </span>
-                  </div>
-                </div>
-              </div>
-            </a>
-          </div>
+                  </v-col>
+                </v-row>
+              </v-card-text>
+            </v-card>
+          </v-container>
         </div>
       </div>
     </div>