@coopenomics/desktop 2025.5.14 → 2025.6.14

package/src/widgets/Meets/MeetDetailsActions/MeetDetailsActions.vue

@@ -1,35 +1,39 @@
 <template lang="pug">
-q-card(flat class="card-container q-pa-md" v-if="canManageMeet")
+div
   div.row.q-col-gutter-md
     div.col-12.col-md-auto(v-if="canCloseBySecretary")
       q-btn(
-        color="negative"
-        icon="fa-solid fa-door-closed"
-        label="Закрыть собрание (Секретарь)"
+        color="primary"
+        icon="fa-solid fa-signature"
+        label="Подписать протокол"
         @click="closeMeetBySecretary"
         :loading="isProcessing"
       )
     div.col-12.col-md-auto(v-if="canCloseByPresider")
       q-btn(
-        color="negative"
-        icon="fa-solid fa-door-closed"
-        label="Закрыть собрание (Председатель)"
+        color="primary"
+        icon="fa-solid fa-stamp"
+        label="Утвердить протокол"
         @click="closeMeetByPresider"
         :loading="isProcessing"
       )
     div.col-12.col-md-auto(v-if="canRestartMeet")
       RestartMeet(
-        :meet="meet"
         show-button
         @restart="handleRestartMeet"
+        :loading="isProcessing"
       )
+
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { useCloseMeet } from 'src/features/Meet/CloseMeetWithDecision/model'
+import { useRestartMeet } from 'src/features/Meet/RestartMeet/model'
 import { RestartMeet } from 'src/features/Meet/RestartMeet'
+import { useMeetStore } from 'src/entities/Meet'
 import type { IMeet } from 'src/entities/Meet'
-import { useMeetDetailsManagement } from 'src/features/Meet/MeetDetailsManagement'
 
 const props = defineProps<{
   meet: IMeet
@@ -38,14 +42,28 @@ const props = defineProps<{
 }>()
 
 const isProcessing = ref(false)
+const meetStore = useMeetStore()
+const router = useRouter()
+
+// Устанавливаем текущее собрание в store при монтировании и обновлении пропсов
+onMounted(() => {
+  meetStore.setCurrentMeet(props.meet)
+})
+
+watch(() => props.meet, (newMeet) => {
+  meetStore.setCurrentMeet(newMeet)
+}, { deep: true })
 
 const {
-  canManageMeet,
   canCloseBySecretary,
   canCloseByPresider,
-  canRestartMeet,
   closeMeetBySecretary,
-  closeMeetByPresider,
+  closeMeetByPresider
+} = useCloseMeet(isProcessing)
+
+const {
+  canRestartMeet,
   handleRestartMeet
-} = useMeetDetailsManagement(props.meet, props.coopname, props.meetHash, isProcessing)
-</script> 
+} = useRestartMeet(router, isProcessing)
+
+</script>

package/src/widgets/Meets/MeetDetailsAgenda/MeetDetailsAgenda.vue

@@ -1,29 +1,48 @@
 <template lang="pug">
-q-card(flat class="card-container q-pa-md")
-  div.text-h6.q-mb-md Вопросы повестки
+div
+  div.row.justify-center
+    div.text-h6.q-mt-md.full-width.text-center Повестка
 
-  div.row.q-col-gutter-md
-    div.col-12.col-md-6(v-for="(item, index) in meetAgendaItems" :key="index")
-      q-card(flat bordered)
-        q-card-section
-          div.text-h6 {{ item.title }}
-          q-separator.q-my-sm
-          div.text-body1 {{ item.context }}
-          q-separator.q-my-sm
-          div.text-subtitle1.text-weight-bold Решение
-          div.text-body2 {{ item.decision }}
+    div.col-12.col-md-12(v-for="(item, index) in meetAgendaItems" :key="index")
+      q-card(flat bordered).q-mb-md.q-mt-md.q-pt-md
+        q-card-section.q-pa-xs
+          div.q-mb-xs.flex.items-start.q-mb-lg.q-pa-xs
+            AgendaNumberAvatar(:number="index + 1" class="q-ma-md")
+            div.col
+              div.text-body1.text-weight-medium.q-mb-2 {{ item.title }}
+              div.text-caption.q-mb-1.q-mt-md
+                span.text-weight-bold Проект решения:
+                span.q-ml-xs {{ item.decision }}
+              div.text-caption.q-mt-md
+                span.text-weight-bold Приложения:
+                span.q-ml-xs(v-if="item.context" v-html="parseLinks(item.context)")
+                span.q-ml-xs(v-else) —
+  div.row.justify-center
+    SignNotificationButton(
+      v-if="coopname && meetHash"
+      :coopname="coopname"
+      :meetHash="meetHash"
+    )
 </template>
 
 <script setup lang="ts">
-import type { IMeet } from 'src/entities/Meet'
 import { computed } from 'vue'
+import type { IMeet } from 'src/entities/Meet'
+import { AgendaNumberAvatar } from 'src/shared/ui/AgendaNumberAvatar'
+import { SignNotificationButton } from 'src/features/Meet/SignNotification/ui'
+import { parseLinks } from 'src/shared/lib/utils'
 
 const props = defineProps<{
-  meet: IMeet
+  meet: IMeet,
+  coopname?: string,
+  meetHash?: string
 }>()
 
+const coopname = computed(() => props.coopname || '')
+const meetHash = computed(() => props.meetHash || '')
+
 const meetAgendaItems = computed(() => {
   if (!props.meet) return []
   return props.meet.processing?.questions || []
 })
-</script> 
+</script>

package/src/widgets/Meets/MeetDetailsInfo/MeetDetailsInfo.vue

@@ -0,0 +1,27 @@
+<template lang="pug">
+div
+  q-card(flat bordered).q-pa-md
+    MeetInfoCard(:meet="meet")
+    // Слот для действий (кнопки)
+    div.q-mt-md(v-if="$slots.actions")
+      slot(name="actions")
+</template>
+
+<script setup lang="ts">
+import { MeetInfoCard } from 'src/shared/ui/MeetInfoCard'
+import type { IMeet } from 'src/entities/Meet'
+
+defineProps<{
+  meet: IMeet
+}>()
+
+</script>
+
+<style lang="scss" scoped>
+@import 'src/shared/ui/CardStyles/index.scss';
+
+.meet-status {
+  font-size: 14px;
+  padding: 4px 8px;
+}
+</style>

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

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

package/src/widgets/Meets/MeetDetailsResults/MeetDetailsResults.vue

@@ -0,0 +1,129 @@
+<template lang="pug">
+div(flat)
+  div.text-center.text-h6.q-mb-md РЕЗУЛЬТАТЫ
+
+  div.row.justify-center
+    // Отображаем документ собрания, если он есть
+    ExpandableDocument(
+      v-if="!!meet?.processed?.decisionAggregate"
+      :documentAggregate="meet.processed.decisionAggregate"
+      title="Протокол решения общего собрания пайщиков"
+    )
+    div.col-12.col-md-12(v-for="(item, index) in meetAgendaItems" :key="index")
+      q-card(flat bordered).q-mb-md
+        q-card-section
+          div.row
+            div.col-12.col-md-auto.flex.justify-center.q-pa-md
+              AgendaNumberAvatar(:number="item.number")
+            div.col-12.col-md
+
+              div.row.justify-between.items-center
+                div.text-h6 {{ item.title }}
+                q-badge(
+                  :color="getResultBadgeColor(item)"
+                  :label="getResultText(item)"
+                  :icon="getResultIcon(item)"
+                  floating
+                  class="text-weight-bold"
+                )
+
+              q-separator.q-my-sm
+              div.text-body1(v-html="parseLinks(item.context)")
+              q-separator.q-my-sm
+
+              //- div.text-subtitle1.text-weight-bold Решение
+              //- div.text-body2 {{ item.decision }}
+              //- q-separator.q-my-sm
+
+              div.row.q-col-gutter-sm.q-mt-sm
+                // Новый push-дизайн карточек голосования
+                div.col-12.col-md-4
+                  q-card(flat bordered :class="'q-pa-md q-mb-sm shadow-2 flex flex-center ' + getCardClass('for')")
+                    q-card-section(class="text-center")
+                      q-icon(name="thumb_up" :color="getCardSemanticColor('for')" size="32px")
+                      div(:class="'text-weight-bold q-mt-sm text-' + getCardSemanticColor('for')") ЗА
+                      div(:class="'text-h5 q-mt-xs text-' + getCardSemanticColor('for')") {{ item.votes_for }}
+                div.col-12.col-md-4
+                  q-card(flat bordered :class="'q-pa-md q-mb-sm shadow-2 flex flex-center ' + getCardClass('against')")
+                    q-card-section(class="text-center")
+                      q-icon(name="thumb_down" :color="getCardSemanticColor('against')" size="32px")
+                      div(:class="'text-weight-bold q-mt-sm text-' + getCardSemanticColor('against')") ПРОТИВ
+                      div(:class="'text-h5 q-mt-xs text-' + getCardSemanticColor('against')") {{ item.votes_against }}
+
+
+                div.col-12.col-md-4
+                  q-card(flat bordered :class="'q-pa-md q-mb-sm shadow-2 flex flex-center ' + getCardClass('abstained')")
+                    q-card-section(class="text-center")
+                      q-icon(name="pan_tool" :color="getCardSemanticColor('abstained')" size="32px")
+                      div(:class="'text-weight-bold q-mt-sm text-' + getCardSemanticColor('abstained')") ВОЗДЕРЖАЛИСЬ
+                      div(:class="'text-h5 q-mt-xs text-' + getCardSemanticColor('abstained')") {{ item.votes_abstained }}
+</template>
+
+<script setup lang="ts">
+import type { IMeet } from 'src/entities/Meet'
+import { computed } from 'vue'
+import { ExpandableDocument } from 'src/shared/ui'
+import { AgendaNumberAvatar } from 'src/shared/ui/AgendaNumberAvatar'
+import { useQuasar } from 'quasar'
+import { parseLinks } from 'src/shared/lib/utils'
+
+const $q = useQuasar()
+const isDark = computed(() => $q.dark.isActive)
+
+const props = defineProps<{
+  meet: IMeet
+}>()
+
+const meetAgendaItems = computed(() => {
+  if (!props.meet || !props.meet.processed?.results) return []
+  return props.meet.processed.results || []
+})
+
+// Классы для карточек голосования с учётом темы
+const getCardClass = (type: 'for' | 'against' | 'abstained') => {
+  if (type === 'for') return isDark.value ? 'bg-green-10 card-border-light' : 'bg-green-1'
+  if (type === 'against') return isDark.value ? 'bg-red-10 card-border-light' : 'bg-red-1'
+  if (type === 'abstained') return isDark.value ? 'bg-grey-9 card-border-light' : 'bg-grey-2'
+  return ''
+}
+
+// Цвет иконки и текста для карточки с учетом темы
+const getCardSemanticColor = (type: 'for' | 'against' | 'abstained') => {
+  if (isDark.value) {
+    // В темной теме используем светлые цвета для контраста
+    if (type === 'for') return 'green-3'
+    if (type === 'against') return 'red-3'
+    if (type === 'abstained') return 'grey-4'
+  } else {
+    // В светлой теме используем стандартные цвета
+    if (type === 'for') return 'positive'
+    if (type === 'against') return 'negative'
+    if (type === 'abstained') return 'grey'
+  }
+  return ''
+}
+
+// Получение текста результата
+const getResultText = (question: any) => {
+  if (question.accepted === undefined) return 'Нет данных'
+  return question.accepted ? 'ПРИНЯТО' : 'ОТКЛОНЕНО'
+}
+
+// Добавляю функции для иконки и цвета результата
+const getResultIcon = (question: any) => {
+  if (question.accepted === undefined) return 'help_outline'
+  return question.accepted ? 'check_circle' : 'cancel'
+}
+
+const getResultBadgeColor = (question: any) => {
+  if (question.accepted === undefined) return 'grey-5'
+  return question.accepted ? 'positive' : 'negative'
+}
+</script>
+
+<style scoped>
+/* Светлая рамка для карточек в тёмном режиме */
+.card-border-light {
+  border: 1.5px solid #fff2;
+}
+</style>

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

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

package/src/widgets/Meets/MeetDetailsVoting/MeetDetailsVoting.vue

@@ -1,59 +1,86 @@
 <template lang="pug">
-q-card(flat class="card-container q-pa-md" v-if="canVote")
-  div.text-h6.q-mb-md Голосование
-
-  div.row.q-col-gutter-md
-    div.col-12.col-md-6(v-for="(item, index) in meetAgendaItems" :key="index")
-      q-card(flat bordered)
-        q-card-section
-          div.text-h6 {{ item.title }}
-          q-separator.q-my-sm
-          div.text-body1 {{ item.context }}
-          q-separator.q-my-sm
-          div.text-subtitle1.q-mb-sm Ваш голос:
-          div.row.q-col-gutter-sm
-            div.col-4
-              q-radio(
-                v-model="votes[index]"
-                val="for"
-                label="ЗА"
-                color="positive"
-              )
-            div.col-4
-              q-radio(
-                v-model="votes[index]"
-                val="against"
-                label="ПРОТИВ"
-                color="negative"
-              )
-            div.col-4
-              q-radio(
-                v-model="votes[index]"
-                val="abstained"
-                label="ВОЗДЕРЖАЛСЯ"
-                color="grey"
-              )
-
-  div.row.justify-center.q-mt-lg
-    q-btn.q-px-xl(
-      color="primary"
-      label="ГОЛОСОВАТЬ"
-      size="lg"
-      :loading="isVoting"
-      @click="submitVote"
-      :disable="!allVotesSelected"
-    )
-
-  q-banner(rounded class="bg-blue-1 text-blue-8 q-mt-md" v-if="isVotingNotStarted")
-    div.text-center.text-subtitle1 Голосование еще не началось. Дата начала: {{ formattedOpenDate }}
-  q-banner(rounded class="bg-blue-1 text-blue-8 q-mt-md" v-else-if="isVotingEnded")
-    div.text-center.text-subtitle1 Голосование уже завершено. Дата окончания: {{ formattedCloseDate }}
+div
+  // Баннер для уже проголосовавших пользователей
+  q-banner.q-mb-md(
+    v-if="meet?.processing?.isVoted"
+    rounded
+    color="positive"
+    text-color="white"
+  ).text-center
+    template(#avatar)
+      q-icon(name="how_to_vote" color="primary" size="50px" class="q-mt-md q-mb-md")
+    div.text-body1.text-weight-medium Вы уже приняли участие в голосовании. Ваш голос принят и учтен.
+
+
+  div(v-if="!meet?.processing?.isVoted", flat)
+    q-card-section.text-center
+      .text-h6 Голосование
+    q-card(flat bordered v-for="(item, index) in meetAgendaItems", :key="index").q-mb-md.q-pt-md
+      q-card-section.q-pa-xs
+        div.q-mb-xs.flex.items-start.q-mb-lg.q-pa-xs
+          AgendaNumberAvatar(:number="index + 1" class="q-ma-md")
+          div.col
+            div.text-body1.text-weight-medium.q-mb-2 {{ item.title }}
+            div.text-caption.q-mb-1.q-mt-md
+              span.text-weight-bold Проект решения:
+              span.q-ml-xs {{ item.decision }}
+            div.text-caption.q-mt-md
+              span.text-weight-bold Приложения:
+              span.q-ml-xs(v-if="item.context" v-html="parseLinks(item.context)")
+              span.q-ml-xs(v-else) —
+            q-separator.q-my-md
+            .text-subtitle1.q-mb-sm Ваш голос:
+            .row.q-col-gutter-sm
+              .col-12.col-md-4
+
+                label.vote-radio-wrapper.positive
+                  q-radio(
+                    v-model="votes[index]",
+                    val="for",
+                    color="positive",
+                    size="lg",
+                    label="ЗА"
+                  )
+              .col-12.col-md-4
+                label.vote-radio-wrapper.negative
+                  q-radio(
+                    v-model="votes[index]",
+                    val="against",
+                    color="negative",
+                    size="lg",
+                    label="ПРОТИВ"
+                  )
+              .col-12.col-md-4
+                label.vote-radio-wrapper.grey
+                  q-radio(
+                    v-model="votes[index]",
+                    val="abstained",
+                    color="grey",
+                    size="lg",
+                    label="ВОЗДЕРЖАЛСЯ"
+                  )
+
+    q-separator
+    q-card-actions(align="center").q-pa-md
+      q-btn.q-px-xl(
+        color="primary",
+        label="ГОЛОСОВАТЬ",
+        size="lg",
+        :loading="isVoting",
+        @click="submitVote",
+        :disable="!allVotesSelected"
+      )
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted, onUnmounted } from 'vue'
+import { AgendaNumberAvatar } from 'src/shared/ui/AgendaNumberAvatar'
 import type { IMeet } from 'src/entities/Meet'
-import { useMeetDetailsVoting } from './model'
+import { useSessionStore } from 'src/entities/Session'
+import { FailAlert, SuccessAlert } from 'src/shared/api'
+import { useSignDocument } from 'src/shared/lib/document'
+import { useVoteOnMeet, type IVoteOnMeetInput } from 'src/features/Meet/VoteOnMeet'
+import { parseLinks } from 'src/shared/lib/utils'
 
 const props = defineProps<{
   meet: IMeet
@@ -61,17 +88,149 @@ const props = defineProps<{
   meetHash: string
 }>()
 
-const isVoting = ref(false)
-const votes = ref<Record<number, 'for' | 'against' | 'abstained'>>({})
-
 const {
-  canVote,
+  votes,
   meetAgendaItems,
   allVotesSelected,
-  isVotingNotStarted,
-  isVotingEnded,
-  formattedOpenDate,
-  formattedCloseDate,
-  submitVote
-} = useMeetDetailsVoting(props.meet, props.coopname, props.meetHash, votes, isVoting)
-</script> 
+  setMeet,
+  voteOnMeet,
+  resetVotes,
+  generateBallot
+} = useVoteOnMeet()
+
+const sessionStore = useSessionStore()
+const { signDocument } = useSignDocument()
+
+const isVoting = ref(false)
+
+// Устанавливаем собрание из пропсов при монтировании
+onMounted(() => {
+  // Устанавливаем собрание из пропсов в композабл
+  setMeet(props.meet)
+
+  // Сбрасываем голоса при открытии компонента
+  resetVotes()
+})
+
+// Очищаем ссылку на собрание при размонтировании
+onUnmounted(() => {
+  setMeet(null)
+  resetVotes()
+})
+
+const submitVote = async () => {
+  if (!allVotesSelected.value) return
+
+  isVoting.value = true
+  try {
+    const generatedBallot = await generateBallot({
+      coopname: props.coopname,
+      username: sessionStore.username,
+      meet_hash: props.meetHash,
+      answers: meetAgendaItems.value.map((question, index) => ({
+        id: question.id.toString(),
+        number: question.number.toString(),
+        vote: votes.value[index]
+      }))
+    })
+
+    const signedBallot = await signDocument(generatedBallot, sessionStore.username)
+
+    const vote: IVoteOnMeetInput = {
+      coopname: props.coopname,
+      hash: props.meetHash,
+      ballot: signedBallot,
+      username: sessionStore.username,
+      votes: meetAgendaItems.value.map((item, index) => ({
+        question_id: item.id,
+        vote: votes.value[index]
+      }))
+    }
+
+    await voteOnMeet(vote)
+    SuccessAlert('Ваш голос успешно отправлен')
+  } catch (error: any) {
+    console.error(error)
+    FailAlert(error)
+  } finally {
+    isVoting.value = false
+  }
+}
+</script>
+
+<style scoped>
+.vote-radio-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f5f7fa;
+  border-radius: 16px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,0.07);
+  padding: 18px 8px 12px 8px;
+  margin-bottom: 8px;
+  transition: box-shadow 0.2s, background 0.2s, color 0.2s;
+  color: black;
+  cursor: pointer;
+}
+.vote-radio-wrapper.positive {
+  background: #e8f5e9;
+}
+.vote-radio-wrapper.negative {
+  background: #ffebee;
+}
+.vote-radio-wrapper.grey {
+  background: #eceff1;
+}
+.vote-radio-wrapper:hover {
+  box-shadow: 0 4px 24px 0 rgba(0,0,0,0.13);
+  background: #e3eafc;
+}
+.vote-icon {
+  margin-left: 10px;
+}
+.q-radio__label {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+/* --- DARK THEME SUPPORT --- */
+.body--dark .vote-radio-wrapper,
+.q-dark .vote-radio-wrapper {
+  background: #23272f;
+  color: #fff;
+}
+.body--dark .vote-radio-wrapper.positive,
+.q-dark .vote-radio-wrapper.positive {
+  background: #295b36;
+}
+.body--dark .vote-radio-wrapper.negative,
+.q-dark .vote-radio-wrapper.negative {
+  background: #5b2323;
+}
+.body--dark .vote-radio-wrapper.grey,
+.q-dark .vote-radio-wrapper.grey {
+  background: #2c313a;
+}
+.body--dark .q-radio__label,
+.q-dark .q-radio__label {
+  color: #fff;
+}
+
+/* Кастомизация кружка radio для тёмной темы */
+.body--dark :deep(.vote-radio-wrapper .q-radio__inner),
+.q-dark :deep(.vote-radio-wrapper .q-radio__inner) {
+  border-color: #fff !important;
+}
+.body--dark :deep(.vote-radio-wrapper.positive .q-radio__inner),
+.q-dark :deep(.vote-radio-wrapper.positive .q-radio__inner) {
+  border-color: #4caf50 !important;
+}
+.body--dark :deep(.vote-radio-wrapper.negative .q-radio__inner),
+.q-dark :deep(.vote-radio-wrapper.negative .q-radio__inner) {
+  border-color: #f44336 !important;
+}
+.body--dark :deep(.vote-radio-wrapper.grey .q-radio__inner),
+.q-dark :deep(.vote-radio-wrapper.grey .q-radio__inner) {
+  border-color: #b0bec5 !important;
+}
+</style>

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

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

package/src/widgets/Meets/MeetQuorumIndicator/ui/MeetQuorumIndicator.vue

@@ -0,0 +1,35 @@
+<template lang="pug">
+div(flat bordered).info-card.hover
+  q-card(flat bordered).q-pa-md
+    div.text-h6.q-mb-xs.full-width.text-center Явка
+
+    div.row
+      div.col-12
+        q-linear-progress(
+          :value="(meet.processing?.meet?.current_quorum_percent ?? 0) / 100"
+          :buffer="(meet.processing?.meet?.quorum_percent ?? 0) / 100"
+          track-color="lime"
+          size="50px"
+          rounded
+        ).bg-grey
+          div.absolute-full.flex.flex-center
+            div.text-center
+              div.text-white.text-weight-medium(style="font-size: 22px; line-height: 1.2;")
+                | {{ (Math.round((meet.processing?.meet?.current_quorum_percent ?? 0) * 10) / 10).toFixed(1) }}%
+        div.q-mt-xs.full-width.text-center.text-caption.text-grey-7
+          | Собрание состоится при явке не менее {{ meet.processing?.meet?.quorum_percent ?? 0 }}% участников
+
+
+</template>
+
+<script setup lang="ts">
+import type { IMeet } from 'src/entities/Meet'
+
+defineProps<{
+  meet: IMeet
+}>()
+</script>
+
+<style lang="scss" scoped>
+@import 'src/shared/ui/CardStyles/index.scss';
+</style>