@coopenomics/desktop 2025.5.14 → 2025.6.13

package/src/shared/ui/AgendaNumberAvatar/AgendaNumberAvatar.vue

@@ -0,0 +1,12 @@
+<template lang="pug">
+q-avatar(color="primary" text-color="white" size="40px") {{ number }}
+</template>
+
+<script setup lang="ts">
+defineProps({
+  number: {
+    type: [String, Number],
+    required: true,
+  },
+})
+</script>

package/src/shared/ui/AgendaNumberAvatar/index.ts

@@ -0,0 +1 @@
+export { default as AgendaNumberAvatar } from './AgendaNumberAvatar.vue';

package/src/shared/ui/BaseDocument/BaseDocument.vue

@@ -29,7 +29,7 @@ q-card(:flat="isMobile" style="word-break: break-all !important; white-space: no
             q-expansion-item(
               v-for="(signature, index) in documentAggregate.document.signatures"
               :key="index"
-              :label="`Подпись ${index + 1}: ${getSignerName(signature.signer_info)}`"
+              :label="`Подпись ${index + 1}: ${getSignerName(signature.signer_certificate)}`"
               header-class="signature-header"
               dense
             )
@@ -38,7 +38,7 @@ q-card(:flat="isMobile" style="word-break: break-all !important; white-space: no
                   div.q-mb-sm
                     q-badge(:color="signature.is_valid ? 'teal' : 'red'").text-center.q-pa-xs
                       span Подписант
-                    p.q-mt-sm.q-ml-lg {{ getSignerName(signature.signer_info) }}
+                    p.q-mt-sm.q-ml-lg {{ getSignerName(signature.signer_certificate) }}
 
                   div(v-if="signature.public_key").q-mb-sm
                     q-badge(:color="signature.is_valid ? 'teal' : 'red'").text-center.q-pa-xs
@@ -68,9 +68,9 @@ import { useGlobalStore } from 'src/shared/store';
 import DOMPurify from 'dompurify';
 import { DigitalDocument } from 'src/shared/lib/document';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
-import { getNameFromUserData } from 'src/shared/lib/utils/getNameFromUserData';
 import { useWindowSize } from 'src/shared/hooks';
 import type { IDocumentAggregate } from 'src/entities/Document/model';
+import { getNameFromCertificate } from 'src/shared/lib/utils/getNameFromCertificate';
 
 const props = defineProps({
   documentAggregate: {
@@ -106,7 +106,10 @@ const regenerate = async() => {
 
 // Функция для декодирования и очистки HTML
 function sanitizeHtml(html: string) {
-  return DOMPurify.sanitize(html);
+  return DOMPurify.sanitize(html, {
+    ADD_TAGS: ['style'],
+    ADD_ATTR: ['class', 'id']
+  });
 }
 
 const safeHtml = computed(() => sanitizeHtml(doc.value?.html ?? ''));
@@ -131,10 +134,10 @@ const hashBuffer = async () => {
   }
 }
 
-// Получение ФИО подписанта
-const getSignerName = (signer: any) => {
-  if (!signer) return 'Неизвестный подписант';
-  return getNameFromUserData(signer) || signer;
+// Получение ФИО/названия подписанта по сертификату
+const getSignerName = (signer_certificate: any) => {
+  if (!signer_certificate) return 'Неизвестный подписант';
+  return getNameFromCertificate(signer_certificate) || 'Неизвестный подписант';
 }
 
 // Верификация всех подписей из агрегата
@@ -228,4 +231,30 @@ const hasInvalidSignature = computed(() => props.documentAggregate?.document?.si
     padding: 10px !important;
   }
 }
+/*
+/* Стили для таблиц внутри документа */
+.description table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+.description th,
+.description td {
+  border: 1px solid #ccc;
+  padding: 8px;
+  text-align: left;
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+}
+
+.description th {
+  background-color: #f4f4f4;
+  width: 30% !important;
+  max-width: 30% !important;
+  word-break: break-word !important;
+}
+.q-table--no-wrap th, .q-table--no-wrap td {
+  white-space: break-spaces !important;
+  word-break: break-word !important;
+}
 </style>

package/src/shared/ui/ExpandableDocument/ExpandableDocument.vue

@@ -0,0 +1,49 @@
+<template lang="pug">
+q-card(flat).expandable-document.q-mb-md
+  q-expansion-item(
+    switch-toggle-side
+    :label="title || 'Электронный документ'"
+    icon="article"
+    header-class="document-header"
+    expand-icon-class="text-primary"
+  )
+    q-card
+      q-card-section
+        div.row.justify-center
+          BaseDocument(
+            :documentAggregate="documentAggregate"
+          ).col-xs-12.col-md-10
+</template>
+
+<script setup lang="ts">
+import { BaseDocument } from '../BaseDocument'
+import type { IDocumentAggregate } from 'src/entities/Document/model'
+
+defineProps({
+  documentAggregate: {
+    type: Object as () => IDocumentAggregate,
+    required: true
+  },
+  title: {
+    type: String,
+    default: 'Документ собрания'
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.expandable-document {
+  width: 100%;
+  border: 1px solid #f0f0f0;
+  border-radius: 8px;
+
+  :deep(.document-header) {
+    font-weight: 500;
+    border-radius: 8px;
+
+    .q-icon {
+      color: var(--q-primary);
+    }
+  }
+}
+</style>

package/src/shared/ui/ExpandableDocument/index.ts

@@ -0,0 +1 @@
+export { default as ExpandableDocument } from './ExpandableDocument.vue'

package/src/shared/ui/MeetInfoCard/index.ts

@@ -0,0 +1 @@
+export { default as MeetInfoCard } from './ui/MeetInfoCard.vue'

package/src/shared/ui/MeetInfoCard/ui/MeetInfoCard.vue

@@ -0,0 +1,62 @@
+<template lang="pug">
+div
+  div.row.q-mb-sm
+    div.col-12
+      div.text-h5.q-mb-xs.full-width.text-center Общее собрание № {{ meet.processing?.meet?.id }}
+
+
+  div.row.justify-around.q-mt-md
+    div.col-xs-12.col-md-5
+
+      div.row.q-mb-sm.items-baseline
+        div.col-xs-12.col-sm-5.card-label Председатель:
+        div.col-xs-12.col-sm-7.card-value {{ getNameFromCertificate(meet.processing?.meet?.presider_certificate) }}
+
+      div.row.q-mb-sm.items-baseline
+        div.col-xs-12.col-sm-5.card-label Секретарь:
+        div.col-xs-12.col-sm-7.card-value {{ getNameFromCertificate(meet.processing?.meet?.secretary_certificate) }}
+
+      div.row.q-mb-sm.items-baseline
+        div.col-xs-12.col-sm-5.card-label Открытие:
+        div.col-xs-12.col-sm-7.card-value {{ meetStatus.formattedOpenDate }} ({{ timezoneLabel }})
+
+    div.col-xs-12.col-md-5
+      div.row.q-mb-sm.items-baseline
+        div.col-xs-12.col-sm-5.card-label Кворум:
+        div.col-xs-12.col-sm-7.card-value {{ meet.processing?.meet?.quorum_percent }}%
+
+      div.row.q-mb-sm.items-baseline
+        div.col-xs-12.col-sm-5.card-label Явка:
+        div.col-xs-12.col-sm-7.card-value {{ (Math.round((meet.processing?.meet?.current_quorum_percent ?? 0) * 10) / 10).toFixed(1) }}%
+
+
+      div.row.q-mb-sm.items-baseline
+        div.col-xs-12.col-sm-5.card-label Закрытие:
+        div.col-xs-12.col-sm-7.card-value {{ meetStatus.formattedCloseDate }} ({{ timezoneLabel }})
+
+  div.row.justify-around.q-mt-lg
+    MeetStatusBanner(:meet="meet")
+
+
+</template>
+
+<script setup lang="ts">
+import type { IMeet } from 'src/entities/Meet'
+import { useMeetStatus } from 'src/shared/lib/composables'
+import { getNameFromCertificate } from 'src/shared/lib/utils/getNameFromCertificate'
+import { MeetStatusBanner } from 'src/shared/ui/MeetStatusBanner'
+import { getTimezoneLabel } from 'src/shared/lib/utils/dates/timezone'
+
+const props = defineProps<{
+  meet: IMeet
+}>()
+
+// Название часового пояса для отображения в лейблах
+const timezoneLabel = getTimezoneLabel()
+
+const meetStatus = useMeetStatus(props.meet)
+</script>
+
+<style lang="scss" scoped>
+@import 'src/shared/ui/CardStyles/index.scss';
+</style>

package/src/shared/ui/MeetStatusBanner/index.ts

@@ -0,0 +1 @@
+export { default as MeetStatusBanner } from './ui/MeetStatusBanner.vue'

package/src/shared/ui/MeetStatusBanner/ui/MeetStatusBanner.vue

@@ -0,0 +1,94 @@
+<template lang="pug">
+// Баннер с информацией о статусе собрания
+div.full-width
+  q-banner(
+    v-if="extendedStatus && extendedStatus !== 'NONE'",
+    rounded,
+    :class="bannerClasses"
+    :style="bannerStyle"
+  ).q-pa-md
+    template(v-slot:avatar)
+      q-icon(:name="bannerConfig.icon" :color="iconColor")
+    div {{ statusText }} {{ timeText }}
+
+
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { IMeet } from 'src/entities/Meet'
+import { EXTENDED_STATUS_MAP, STATUS_BANNER_CONFIG } from 'src/shared/lib/consts'
+import { formatDateFromNow } from 'src/shared/lib/utils/dates/timezone'
+
+const props = defineProps<{
+  meet: IMeet
+}>()
+
+// Получаем расширенный статус собрания
+const extendedStatus = computed(() => {
+  return props.meet?.processing?.extendedStatus || 'NONE'
+})
+
+// Текст статуса собрания
+const statusText = computed(() => {
+  if (!props.meet?.processing?.extendedStatus) return 'Неизвестный статус'
+  return EXTENDED_STATUS_MAP[props.meet.processing.extendedStatus] || 'Неизвестный статус'
+})
+
+// Конфигурация баннера
+const bannerConfig = computed(() => {
+  if (!props.meet?.processing?.extendedStatus) {
+    return STATUS_BANNER_CONFIG['NONE']
+  }
+  return (
+    STATUS_BANNER_CONFIG[props.meet.processing.extendedStatus] || STATUS_BANNER_CONFIG['NONE']
+  )
+})
+
+const bannerClasses = computed(() => {
+  const config = bannerConfig.value
+  if (config.outline) {
+    return 'bg-grey-1 outlined-banner'
+  }
+  return `bg-${config.color} text-white`
+})
+
+const bannerStyle = computed(() => {
+  const config = bannerConfig.value
+  if (config.outline) {
+    return { borderColor: `var(--q-color-${config.color})` }
+  }
+  return {}
+})
+
+const iconColor = computed(() => {
+  const config = bannerConfig.value
+  return config.outline ? config.color : 'white'
+})
+
+// Форматированное время до открытия/закрытия с учетом часового пояса
+const timeText = computed(() => {
+  if (!bannerConfig.value.needTime) return ''
+
+  // Для статуса WAITING_FOR_OPENING
+  if (props.meet?.processing?.extendedStatus === 'WAITING_FOR_OPENING') {
+    if (!props.meet?.processing?.meet?.open_at) return ''
+    return formatDateFromNow(props.meet.processing.meet.open_at)
+  }
+
+  // Для статуса VOTING_IN_PROGRESS
+  if (props.meet?.processing?.extendedStatus === 'VOTING_IN_PROGRESS') {
+    if (!props.meet?.processing?.meet?.close_at) return ''
+    return formatDateFromNow(props.meet.processing.meet.close_at)
+  }
+
+  return ''
+})
+</script>
+
+<style lang="scss" scoped>
+.outlined-banner {
+  border-width: 1px;
+  border-style: solid;
+}
+</style>

package/src/shared/ui/index.ts

@@ -1 +1,2 @@
 export * from './CopyableInput';
+export * from './ExpandableDocument';

package/src/widgets/Cooperative/Documents/ListOfDocuments/ui/DocumentsTable.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-div.scroll-area(style="height: 90vh; overflow-y: auto;")
+div.scroll-area(style="height: calc(100% - $toolbar-min-height); overflow-y: auto;")
   q-table(
     ref="tableRef"
     flat
@@ -45,7 +45,7 @@ div.scroll-area(style="height: 90vh; overflow-y: auto;")
             color="primary"
             round
             dense
-            :icon="expanded.get(props.row?.id || props.row?.statement?.action?.global_sequence) ? 'remove' : 'add'"
+            :icon="expanded.get(props.row?.id || props.row?.statement?.action?.global_sequence) ? 'expand_more' : 'chevron_right'"
             @click="toggleExpand(props.row?.id || props.row?.statement?.action?.global_sequence)"
           )
 
@@ -160,4 +160,4 @@ const toggleExpand = (id: any) => {
 .documents-table .q-table__top{
   padding: 0px !important;
 }
-</style>
+</style>

package/src/widgets/Cooperative/Orders/ListOfOrders/ui/ListOfOrdersWidget.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
   div.row.justify-center
     div.col-12
-      div.scroll-area(style="height: 90vh; overflow-y: auto;")
+      div.scroll-area(style="height: calc(100% - $toolbar-min-height); overflow-y: auto;")
         q-table(
           v-if="payments && payments.items"
           ref="tableRef"
@@ -48,7 +48,7 @@
                   color="primary"
                   round
                   dense
-                  :icon="expanded.get(props.row.id) ? 'remove' : 'add'"
+                  :icon="expanded.get(props.row.id) ? 'expand_more' : 'chevron_right'"
                   @click="toggleExpand(props.row.id)"
                 )
               q-td {{props.row.id}}

package/src/widgets/Cooperative/Payments/ListOfPayments/ui/ListOfPaymentsWidget.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
   div.row.justify-center
     div.col-12
-      div.scroll-area(style="height: 90vh; overflow-y: auto;")
+      div.scroll-area(style="height: calc(100% - $toolbar-min-height); overflow-y: auto;")
         q-table(
           v-if="payments && payments.items"
           ref="tableRef"
@@ -47,7 +47,7 @@
                   color="primary"
                   round
                   dense
-                  :icon="expanded.get(props.row.id) ? 'remove' : 'add'"
+                  :icon="expanded.get(props.row.id) ? 'expand_more' : 'chevron_right'"
                   @click="toggleExpand(props.row.id)"
                 )
               q-td(style="max-width: 150px; word-wrap: break-word; white-space: normal;") {{ getName(props.row.account) }}

package/src/widgets/Desktop/WorkspaceMenu/WorkspaceMenu.vue

@@ -53,99 +53,91 @@ div
             div.btn-font.text-center {{ item.title }}
 </template>
 
-  <script setup lang="ts">
-  import { ref, computed, onMounted, watch } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { useSystemStore } from 'src/entities/System/model'
-  import { useCurrentUserStore } from 'src/entities/User'
-  import { useDesktopStore } from 'src/entities/Desktop/model'
-  import { useSessionStore } from 'src/entities/Session'
+<script setup lang="ts">
+import { ref, computed, onMounted, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { useCurrentUserStore } from 'src/entities/User'
+import { useDesktopStore } from 'src/entities/Desktop/model'
 
-  const router = useRouter()
-  const system = useSystemStore()
-  const user = useCurrentUserStore()
-  const session = useSessionStore()
-  const desktop = useDesktopStore()
-  const { info } = system
+const router = useRouter()
+const user = useCurrentUserStore()
+const desktop = useDesktopStore()
 
-  const slideIndex = ref(0)
-  const showDialog = ref(false)
+const slideIndex = ref(0)
+const showDialog = ref(false)
 
-  // workspaceMenus – список рабочих столов из store
-  const workspaceMenus = computed(() => desktop.workspaceMenus)
+// workspaceMenus – список рабочих столов из store
+const workspaceMenus = computed(() => desktop.workspaceMenus)
 
-  // Фильтрация по ролям (если требуется)
-  const menuWorkspaces = computed(() => {
-    const userRole = user.userAccount?.role || 'user'
-    return workspaceMenus.value.filter(item =>
-      item.meta.roles?.includes(userRole) || !item.meta.roles || item.meta.roles.length === 0
-    )
-  })
-
-  const headerClass = (item: any) => {
-    return desktop?.activeWorkspaceName === item.workspaceName ? 'text-white bg-teal' : ''
-  }
-
-
-  // Функция навигации: переходим в рамках маршрутов рабочего стола
-  const open = (route: any) => {
-    if (route && route.children && route.children.length)
-      router.push({ name: route.children[0].name, params: { coopname: info.coopname } })
-    else if (route)
-      router.push({ name: route.name, params: { coopname: info.coopname } })
-  }
+// Фильтрация по ролям (если требуется)
+const menuWorkspaces = computed(() => {
+  const userRole = user.userAccount?.role || 'user'
+  return workspaceMenus.value.filter(item =>
+    item.meta.roles?.includes(userRole) || !item.meta.roles || item.meta.roles.length === 0
+  )
+})
 
-  const handleClick = (item: any, index: number) => {
-    if (slideIndex.value === index) {
-      showDialog.value = true
-    } else {
-      slideIndex.value = index
-      // Обновляем активный рабочий стол
-      desktop.selectWorkspace(item.workspaceName)
-      if (item.mainRoute) open(item.mainRoute)
-    }
-  }
+const headerClass = (item: any) => {
+  return desktop?.activeWorkspaceName === item.workspaceName ? 'text-white bg-teal' : ''
+}
 
-  const selectFromDialog = (index: number) => {
-    showDialog.value = false
+const handleClick = (item: any, index: number) => {
+  if (slideIndex.value === index) {
+    showDialog.value = true
+  } else {
     slideIndex.value = index
-    const item = menuWorkspaces.value[index]
+    // Обновляем активный рабочий стол
     desktop.selectWorkspace(item.workspaceName)
-    if (item.mainRoute) open(item.mainRoute)
+    // Переходим на маршрут по умолчанию для выбранного рабочего стола
+    desktop.goToDefaultPage(router)
   }
+}
 
-  onMounted(() => {
-    if (menuWorkspaces.value.length > 0 && session.isAuth && user.isRegistrationComplete) {
-      slideIndex.value = 0
-      const firstItem = menuWorkspaces.value[0]
-      desktop.selectWorkspace(firstItem.workspaceName)
-      if (firstItem.mainRoute) open(firstItem.mainRoute)
-    }
-  })
+const selectFromDialog = (index: number) => {
+  showDialog.value = false
+  slideIndex.value = index
+  const item = menuWorkspaces.value[index]
+  desktop.selectWorkspace(item.workspaceName)
+  // Переходим на маршрут по умолчанию для выбранного рабочего стола
+  desktop.goToDefaultPage(router)
+}
 
-  // При изменении slideIndex обновляем активный рабочий стол
-  watch(slideIndex, (newIndex) => {
-    const item = menuWorkspaces.value[newIndex]
-    if (item) {
-      desktop.selectWorkspace(item.workspaceName)
-      if (item.mainRoute) open(item.mainRoute)
+onMounted(() => {
+  // Находим индекс активного рабочего стола
+  const activeWorkspaceName = desktop.activeWorkspaceName
+  if (activeWorkspaceName) {
+    const activeIndex = menuWorkspaces.value.findIndex(
+      item => item.workspaceName === activeWorkspaceName
+    )
+    if (activeIndex !== -1) {
+      slideIndex.value = activeIndex
     }
-  })
-  </script>
-
-  <style lang="scss">
-  .btn-menu {
-    height: 100px;
-    width: 100px;
-    border-radius: 0 !important;
-  }
-  .btn-icon {
-    font-size: 20px !important;
   }
-  .btn-font {
-    font-size: 8px !important;
-  }
-  .workspace-menu .q-carousel__slide {
-    padding: 0px !important;
+})
+
+// При изменении slideIndex обновляем активный рабочий стол
+watch(slideIndex, (newIndex) => {
+  const item = menuWorkspaces.value[newIndex]
+  if (item) {
+    desktop.selectWorkspace(item.workspaceName)
+    desktop.goToDefaultPage(router)
   }
-  </style>
+})
+</script>
+
+<style lang="scss">
+.btn-menu {
+  height: 100px;
+  width: 100px;
+  border-radius: 0 !important;
+}
+.btn-icon {
+  font-size: 20px !important;
+}
+.btn-font {
+  font-size: 8px !important;
+}
+.workspace-menu .q-carousel__slide {
+  padding: 0px !important;
+}
+</style>

package/src/widgets/Header/CommonHeader/CooperativeSettingsHeader.vue

@@ -11,7 +11,7 @@ q-header(bordered).bg-gradient-dark
       active-class="bg-teal"
       active-bg-color="teal"
       active-color="white"
-      indicator-color="secondary"
+      indicator-color="primary"
       class="header-tab-container"
     )
       q-route-tab(name="Совет" label="Совет" :to="{name: 'members'}" )

package/src/widgets/Header/CommonHeader/ExtstoreHeader.vue

@@ -11,7 +11,7 @@ q-header(bordered).bg-gradient-dark
       active-class="bg-teal"
       active-bg-color="teal"
       active-color="white"
-      indicator-color="secondary"
+      indicator-color="primary"
       class="header-tab-container"
     )
       q-route-tab(name="Все приложения" label="Все приложения" :to="{name: 'extstore-showcase'}" )

package/src/widgets/Header/CommonHeader/MainHeader.vue

@@ -6,6 +6,9 @@ q-header(bordered :class="headerClass").header
     BackButton(v-if="loggedIn")
     q-toolbar-title()
 
+    // Добавляем компонент уведомлений, если пользователь авторизован
+    NotificationCenter(v-if="loggedIn && isClient")
+
     SettingsDropdown(:isMobile="isMobile" :isChairman="isChairman" :isMember="isMember")
 
     template(v-if="!loggedIn")
@@ -40,6 +43,7 @@ import config from 'src/app/config'
 import { useWindowSize } from 'src/shared/hooks'
 import { SettingsDropdown } from 'src/widgets/Header/SettingsDropdown'
 import { BackButton } from 'src/widgets/Header/BackButton'
+import { NotificationCenter } from 'src/widgets/NotificationCenter'
 import './HeaderStyles.scss'
 // import { env } from 'src/shared/config'
 
@@ -50,6 +54,8 @@ const session = useSessionStore()
 const { isMobile } = useWindowSize()
 const emit = defineEmits(['toggle-left-drawer'])
 
+const isClient = computed(() => typeof process !== 'undefined' && process.env.CLIENT)
+
 // Получаем информацию для навигации назад
 // const coopTitle = computed(() => env.COOP_SHORT_NAME)
 

package/src/widgets/Header/CommonHeader/UserSettingsHeader.vue

@@ -11,7 +11,7 @@ q-header(bordered).flex.bg-gradient-dark
       active-class="bg-teal"
       active-bg-color="teal"
       active-color="white"
-      indicator-color="secondary"
+      indicator-color="primary"
       class="header-tab-container"
     )
       q-route-tab(name="Реквизиты" label="Реквизиты" :to="{name: 'user-payment-methods'}" )

package/src/widgets/Meets/MeetCardsList/index.ts

@@ -0,0 +1 @@
+export { default as MeetCardsList } from './ui/MeetCardsList.vue'