@coopenomics/desktop 2025.5.14 → 2025.6.13

package/src/features/Meet/RestartMeet/model/index.ts

@@ -1,9 +1,17 @@
 import { client } from 'src/shared/api/client';
 import { Mutations } from '@coopenomics/sdk';
-import { generateAgenda } from 'src/features/Meet/GenerateAgenda/model'
 import { DigitalDocument } from 'src/shared/lib/document'
 import { useSessionStore } from 'src/entities/Session';
 import type { Cooperative } from 'cooptypes';
+import { computed, ref, type Ref } from 'vue'
+import { useMeetStore } from 'src/entities/Meet'
+import { FailAlert, SuccessAlert } from 'src/shared/api'
+import moment from 'moment-with-locales-es6'
+import { useSystemStore } from 'src/entities/System/model';
+import { IGenerateAgendaInput, IGenerateAgendaResult } from 'src/features/Meet/CreateMeet/model'
+import { type Router } from 'vue-router';
+
+moment.locale('ru')
 
 export type IRestartMeetInput = Mutations.Meet.RestartAnnualGeneralMeet.IInput['data'];
 export type IRestartMeetResult = Mutations.Meet.RestartAnnualGeneralMeet.IOutput[typeof Mutations.Meet.RestartAnnualGeneralMeet.name];
@@ -21,6 +29,25 @@ export interface IRestartMeetWithProposalInput {
   }[]
 }
 
+/**
+ * Генерирует документ повестки собрания
+ * @private Внутренняя функция, не экспортируется
+ */
+async function generateAgenda(data: IGenerateAgendaInput, options?: any): Promise<IGenerateAgendaResult> {
+  const { [Mutations.Meet.GenerateAnnualGeneralMeetAgendaDocument.name]: generatedDocument } = await client.Mutation(
+    Mutations.Meet.GenerateAnnualGeneralMeetAgendaDocument.mutation,
+    {
+      variables: {
+        data,
+        options
+      }
+    }
+  );
+
+  return generatedDocument;
+}
+
+// Базовые функции для работы с API
 export async function restartMeet(data: IRestartMeetInput): Promise<IRestartMeetResult> {
   const { [Mutations.Meet.RestartAnnualGeneralMeet.name]: result } = await client.Mutation(
     Mutations.Meet.RestartAnnualGeneralMeet.mutation,
@@ -36,11 +63,31 @@ export async function restartMeet(data: IRestartMeetInput): Promise<IRestartMeet
 
 export async function restartMeetWithProposal(data: IRestartMeetWithProposalInput): Promise<IRestartMeetResult> {
   const { username } = useSessionStore()
-  // Генерируем документ повестки
+
+  // Преобразуем формат даты для документа
+  const openAtFormatted = moment(data.new_open_at).format('DD.MM.YYYY HH:mm')
+  const closeAtFormatted = moment(data.new_close_at).format('DD.MM.YYYY HH:mm')
+
+  // Формируем вопросы повестки в требуемом формате
+  const questions = data.agenda_points.map((point, index) => ({
+    number: String(index + 1),
+    title: point.title,
+    decision: point.decision,
+    context: point.context || ''
+  }))
+
+  // Генерируем документ повестки с правильными параметрами согласно DTO
   const generatedDocument = await generateAgenda({
     coopname: data.coopname,
-    username: data.username
+    username: data.username,
+    meet: {
+      type: 'regular', // По умолчанию очередное собрание
+      open_at_datetime: openAtFormatted,
+      close_at_datetime: closeAtFormatted
+    },
+    questions: questions
   })
+
   // Подписываем документ
   const rawDocument = new DigitalDocument(generatedDocument)
   const signedDocument = await rawDocument.sign<Cooperative.Registry.AnnualGeneralMeetingAgenda.Meta>(username)
@@ -53,5 +100,76 @@ export async function restartMeetWithProposal(data: IRestartMeetWithProposalInpu
     new_close_at: data.new_close_at,
     newproposal: signedDocument
   })
+
+  console.log('on result', result)
+
   return result
 }
+
+
+// Композабл для использования в компонентах
+export const useRestartMeet = (
+  router: Router,
+  isProcessing?: Ref<boolean>
+) => {
+  const localIsProcessing = ref(false)
+  const { info } = useSystemStore()
+
+  const processingRef = isProcessing || localIsProcessing
+
+  const meetStore = useMeetStore()
+  const sessionStore = useSessionStore()
+
+  const canRestartMeet = computed(() => {
+    const meet = meetStore.currentMeet
+    if (!meet?.processing?.meet) return false
+
+    const now = moment()
+    const closeAt = moment(meet.processing.meet.close_at)
+
+    const isAfterCloseDate = now.isAfter(closeAt)
+    const isQuorumNotPassed = meet.processing.meet.quorum_passed !== true
+
+    return isAfterCloseDate && isQuorumNotPassed && meet.processing.meet.status === 'authorized'
+  })
+
+  const handleRestartMeet = async (data: {
+    new_open_at: string;
+    new_close_at: string;
+    agenda_points: {
+      title: string;
+      context: string;
+      decision: string;
+    }[];
+  }) => {
+    if (!meetStore.currentMeet) return false
+    processingRef.value = true
+    try {
+      const result = await restartMeetWithProposal({
+        coopname: info.coopname,
+        hash: meetStore.currentMeet.hash,
+        username: sessionStore.username,
+        new_open_at: data.new_open_at,
+        new_close_at: data.new_close_at,
+        agenda_points: data.agenda_points
+      })
+
+      await meetStore.loadMeet({ coopname: info.coopname, hash: result.processing?.hash as string})
+      console.log('router on push', router)
+      router.push({params: {hash: result.processing?.hash as string}})
+
+      SuccessAlert('Собрание успешно перезапущено')
+      return true
+    } catch (error: any) {
+      FailAlert(error)
+      return false
+    } finally {
+      processingRef.value = false
+    }
+  }
+
+  return {
+    canRestartMeet,
+    handleRestartMeet
+  }
+}

package/src/features/Meet/RestartMeet/ui/RestartMeet.vue

@@ -6,13 +6,12 @@ div
     icon="fa-solid fa-rotate"
     label="Перезапустить собрание"
     @click="showRestartDialog = true"
-    :loading="isProcessing"
+    :loading="loading || isProcessing"
   )
 
   RestartMeetForm(
     v-model="showRestartDialog"
-    :meet="meet"
-    :loading="isProcessing"
+    :loading="loading || isProcessing"
     @restart="handleRestart"
   )
 </template>
@@ -20,11 +19,10 @@ div
 <script setup lang="ts">
 import { ref } from 'vue'
 import { RestartMeetForm } from '.';
-import type { IMeet } from 'src/entities/Meet'
 
 defineProps<{
-  meet: IMeet
   showButton?: boolean
+  loading?: boolean
 }>()
 
 const emit = defineEmits<{
@@ -43,4 +41,4 @@ const handleRestart = async (data: any) => {
     isProcessing.value = false
   }
 }
-</script> 
+</script>

package/src/features/Meet/RestartMeet/ui/RestartMeetForm.vue

@@ -10,7 +10,7 @@ q-dialog(:model-value="modelValue" @update:model-value="$emit('update:modelValue
         div.text-subtitle1.q-mb-sm Выберите новые даты для собрания
         q-input(
           v-model="formData.new_open_at"
-          label="Новая дата и время открытия, UTC"
+          :label="env.NODE_ENV === 'development' ? `Новая дата и время открытия (мин. через 1 минуту, ${timezoneLabel})` : `Новая дата и время открытия (мин. через 15 дней, ${timezoneLabel})`"
           type="datetime-local"
           :rules="[val => !!val || 'Обязательное поле']"
           dense
@@ -18,7 +18,7 @@ q-dialog(:model-value="modelValue" @update:model-value="$emit('update:modelValue
         )
         q-input(
           v-model="formData.new_close_at"
-          label="Новая дата и время закрытия, UTC"
+          :label="`Новая дата и время закрытия (${timezoneLabel})`"
           type="datetime-local"
           :rules="[val => !!val || 'Обязательное поле']"
           dense
@@ -27,33 +27,43 @@ q-dialog(:model-value="modelValue" @update:model-value="$emit('update:modelValue
 
         div.text-subtitle1.q-mb-sm При перезапуске собрания будут использованы существующие пункты повестки:
 
-        div.q-pa-sm.q-my-sm.bg-grey-2.rounded-borders(v-if="meet?.processing?.questions?.length")
-          div.q-mb-md(v-for="(question, index) in meet.processing.questions" :key="index")
-            div.text-weight-bold {{ question.title }}
-            div.text-caption {{ question.context }}
-        
+        q-card(bordered flat v-if="meetStore.currentMeet?.processing?.questions?.length").q-pa-xs.q-my-sm.rounded-borders.bg-grey-1
+          div.q-mb-xs.flex.items-start(v-for="(question, index) in meetStore.currentMeet.processing.questions" :key="index").q-mb-lg.q-pa-xs
+            AgendaNumberAvatar(:number="index + 1" size="22px" class="q-mr-xs")
+            div.col
+              div.text-body2.text-weight-medium.q-mb-2 {{ question.title }}
+              div.text-caption.q-mb-1.q-mt-md
+                span.text-weight-bold.text-black Проект решения:
+                span.text-black.q-ml-xs {{question.decision }}
+              div.text-caption.q-mt-md
+                span.text-weight-bold.text-black Приложения:
+                span.text-black(v-if="question.context" v-html="parseLinks(question.context)").q-ml-xs
+                span.text-black(v-else) —
+
         div.q-pa-sm.q-my-sm.bg-red-1.text-red-8.rounded-borders(v-else)
           div.text-center Вопросы повестки не найдены
 
     q-card-actions(align="right")
       q-btn(flat label="Отмена" v-close-popup @click="$emit('update:modelValue', false)" :disable="loading")
       q-btn(
-        color="primary" 
-        label="Перезапустить" 
-        type="submit" 
-        @click="handleSubmit" 
+        color="primary"
+        label="Перезапустить"
+        type="submit"
+        @click="handleSubmit"
         :loading="loading"
-        :disable="!meet?.processing?.questions?.length"
+        :disable="!meetStore.currentMeet?.processing?.questions?.length"
       )
 </template>
 
 <script setup lang="ts">
 import { reactive, watch } from 'vue'
-import type { IMeet } from 'src/entities/Meet'
-
+import { useMeetStore } from 'src/entities/Meet'
+import { getCurrentLocalDateForForm, convertLocalDateToUTC, getTimezoneLabel, getFutureDateForForm } from 'src/shared/lib/utils/dates/timezone'
+import { env } from 'src/shared/config/Environment'
+import { AgendaNumberAvatar } from 'src/shared/ui/AgendaNumberAvatar'
+import { parseLinks } from 'src/shared/lib/utils'
 const props = defineProps<{
   modelValue: boolean,
-  meet: IMeet | null,
   loading?: boolean
 }>()
 
@@ -62,31 +72,57 @@ const emit = defineEmits<{
   (e: 'restart', data: any): void
 }>()
 
+const meetStore = useMeetStore()
+
+// Название часового пояса для отображения в лейблах
+const timezoneLabel = getTimezoneLabel()
+
 // Форма для перезапуска собрания
-const formData = reactive({
-  new_open_at: '',
-  new_close_at: ''
-})
+const formData = reactive(
+  env.NODE_ENV === 'development'
+    ? {
+        new_open_at: getCurrentLocalDateForForm(0.17),
+        new_close_at: getCurrentLocalDateForForm(1),
+      }
+    : {
+        new_open_at: getFutureDateForForm(15, 6, 0),
+        new_close_at: getFutureDateForForm(18, 12, 0),
+      }
+)
 
 // Сброс формы при открытии диалога
 watch(() => props.modelValue, (newVal) => {
   if (newVal) {
-    formData.new_open_at = ''
-    formData.new_close_at = ''
+    if (env.NODE_ENV === 'development') {
+      formData.new_open_at = getCurrentLocalDateForForm(0.17)
+      formData.new_close_at = getCurrentLocalDateForForm(1)
+    } else {
+      formData.new_open_at = getFutureDateForForm(15, 6, 0)
+      formData.new_close_at = getFutureDateForForm(18, 12, 0)
+    }
   }
 })
 
 const handleSubmit = () => {
-  if (!props.meet) return
-  
+  const meet = meetStore.currentMeet
+  if (!meet) return
+
   // Проверяем наличие вопросов повестки
-  if (!props.meet.processing?.questions || props.meet.processing.questions.length === 0) {
+  if (!meet.processing?.questions || meet.processing.questions.length === 0) {
     return
   }
 
-  emit('restart', {
-    ...formData,
-    hash: props.meet.hash
-  })
+  // Конвертируем локальные даты в UTC для отправки в блокчейн
+  const dataToSend = {
+    new_open_at: convertLocalDateToUTC(formData.new_open_at),
+    new_close_at: convertLocalDateToUTC(formData.new_close_at),
+    agenda_points: meet.processing.questions.map(q => ({
+      title: q.title,
+      context: q.context,
+      decision: q.decision
+    }))
+  }
+
+  emit('restart', dataToSend)
 }
 </script>

package/src/features/Meet/SignNotification/index.ts

@@ -0,0 +1,2 @@
+export * from './ui'
+export * from './model'

package/src/features/Meet/SignNotification/model/index.ts

@@ -0,0 +1,137 @@
+import { useMeetStore } from 'src/entities/Meet'
+import { SuccessAlert, FailAlert } from 'src/shared/api'
+import { ref, computed } from 'vue'
+import { client } from 'src/shared/api/client'
+import { Mutations } from '@coopenomics/sdk'
+import { useSignDocument } from 'src/shared/lib/document/model/entity'
+import { useSessionStore } from 'src/entities/Session'
+
+export type IGenerateNotificationInput = Mutations.Meet.GenerateAnnualGeneralMeetNotificationDocument.IInput['data']
+export type IGenerateNotificationResult = Mutations.Meet.GenerateAnnualGeneralMeetNotificationDocument.IOutput[typeof Mutations.Meet.GenerateAnnualGeneralMeetNotificationDocument.name]
+
+export type INotifyOnAnnualGeneralMeetInput = Mutations.Meet.NotifyOnAnnualGeneralMeet.IInput['data']
+export type INotifyOnAnnualGeneralMeetResult = Mutations.Meet.NotifyOnAnnualGeneralMeet.IOutput[typeof Mutations.Meet.NotifyOnAnnualGeneralMeet.name]
+
+/**
+ * Генерирует документ уведомления о собрании
+ * @private Внутренняя функция, не экспортируется
+ */
+async function generateNotification(data: IGenerateNotificationInput, options?: any): Promise<IGenerateNotificationResult> {
+  if (!data.meet_hash) {
+    throw new Error('Параметр meet_hash обязателен для генерации документа уведомления')
+  }
+  console.log('data on send', data)
+  const { [Mutations.Meet.GenerateAnnualGeneralMeetNotificationDocument.name]: generatedDocument } = await client.Mutation(
+    Mutations.Meet.GenerateAnnualGeneralMeetNotificationDocument.mutation,
+    {
+      variables: {
+        data,
+        options
+      }
+    }
+  )
+
+  return generatedDocument
+}
+
+/**
+ * Отправляет уведомление о собрании в блокчейн
+ * @private Внутренняя функция, не экспортируется
+ */
+async function notifyOnAnnualGeneralMeet(data: INotifyOnAnnualGeneralMeetInput): Promise<INotifyOnAnnualGeneralMeetResult> {
+  const { [Mutations.Meet.NotifyOnAnnualGeneralMeet.name]: result } = await client.Mutation(
+    Mutations.Meet.NotifyOnAnnualGeneralMeet.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  )
+
+  return result
+}
+
+/**
+ * Проверяет, отправлял ли пользователь уже уведомление о собрании
+ * @param meet Данные о собрании
+ * @param username Имя пользователя
+ */
+export function isNotificationSent(meet: any, username: string): boolean {
+  if (!meet || !meet.processing || !meet.processing.meet || !meet.processing.meet.notified_users) {
+    return false
+  }
+
+  // Проверяем, есть ли имя пользователя в массиве notified_users
+  return meet.processing.meet.notified_users.includes(username)
+}
+
+/**
+ * Композабл функция для генерации и подписания уведомления о собрании
+ */
+export function useSignNotification() {
+  const meetStore = useMeetStore()
+  const session = useSessionStore()
+  const loading = ref(false)
+
+  // Получаем текущее собрание из store
+  const currentMeet = computed(() => meetStore.currentMeet)
+
+  // Проверяем, отправлял ли текущий пользователь уведомление
+  const hasUserSentNotification = computed(() => {
+    return isNotificationSent(currentMeet.value, session.username)
+  })
+
+  /**
+   * Генерирует и подписывает документ уведомления о собрании
+   */
+  const signNotification = async (params: {
+    coopname: string,
+    meet_hash: string,
+    username: string
+  }) => {
+    try {
+      loading.value = true
+
+      // Генерируем документ уведомления
+      const generatedDocument = await generateNotification({
+        coopname: params.coopname,
+        meet_hash: params.meet_hash,
+        username: params.username
+      })
+
+      // Подписываем документ
+      const { signDocument } = useSignDocument()
+      const signedDocument = await signDocument(generatedDocument, params.username)
+      console.log('signedDocument', signedDocument)
+
+      // Отправляем уведомление в блокчейн
+      await notifyOnAnnualGeneralMeet({
+        coopname: params.coopname,
+        meet_hash: params.meet_hash,
+        username: params.username,
+        notification: signedDocument
+      })
+      console.log('after notify')
+
+      // Перезагружаем информацию о собрании
+      await meetStore.loadMeet({
+        coopname: params.coopname,
+        hash: params.meet_hash
+      })
+
+      SuccessAlert('Уведомление успешно подписано и отправлено')
+      return true
+    } catch (error: any) {
+      FailAlert(error || 'Не удалось подписать уведомление')
+      return false
+    } finally {
+      loading.value = false
+    }
+  }
+
+  return {
+    signNotification,
+    loading,
+    hasUserSentNotification
+  }
+}

package/src/features/Meet/SignNotification/ui/SignNotificationButton.vue

@@ -0,0 +1,61 @@
+<template lang="pug">
+q-btn(
+  v-if="!hasUserSentNotification && isAvailableForNotification"
+  :loading="loading"
+  color="primary"
+  icon="note_add"
+  :label="label"
+  @click="handleSignNotification"
+).q-mb-md.q-mt-md
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useSignNotification } from '../model'
+import { useSessionStore } from 'src/entities/Session'
+import { useMeetStore } from 'src/entities/Meet'
+import { Zeus } from '@coopenomics/sdk';
+
+const props = defineProps<{
+  coopname: string
+  meetHash: string
+  label?: string
+}>()
+
+const session = useSessionStore()
+const meetStore = useMeetStore()
+const { signNotification, loading, hasUserSentNotification } = useSignNotification()
+
+const username = computed(() => session.username)
+const label = computed(() => props.label || 'Подписать уведомление')
+
+const isAvailableForNotification = computed(() => {
+  const meet = meetStore.currentMeet
+  if (!meet || !meet.processing || !meet.processing.extendedStatus) {
+    return false
+  }
+
+  return meet.processing.extendedStatus === Zeus.ExtendedMeetStatus.WAITING_FOR_OPENING
+})
+
+// Загружаем данные о собрании, если они еще не загружены
+const loadMeetData = async () => {
+  if (!meetStore.currentMeet || meetStore.currentMeet.hash !== props.meetHash) {
+    await meetStore.loadMeet({
+      coopname: props.coopname,
+      hash: props.meetHash
+    })
+  }
+}
+
+// Загружаем данные при создании компонента
+loadMeetData()
+
+const handleSignNotification = async () => {
+  await signNotification({
+    coopname: props.coopname,
+    meet_hash: props.meetHash,
+    username: username.value
+  })
+}
+</script>

package/src/features/Meet/SignNotification/ui/index.ts

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