@coopenomics/desktop 2025.5.14 → 2025.6.13

package/src/features/Meet/VoteOnMeet/model/composable.ts

@@ -0,0 +1,180 @@
+import { ref, computed } from 'vue'
+import { client } from 'src/shared/api/client'
+import { Mutations, Zeus } from '@coopenomics/sdk'
+import moment from 'moment-with-locales-es6'
+import { useMeetStore } from 'src/entities/Meet'
+import type { IMeet } from 'src/entities/Meet'
+import type { IVoteOnMeetInput, IVoteOnMeetResult } from './types'
+import { formatDateToLocalTimezone } from 'src/shared/lib/utils/dates/timezone'
+
+moment.locale('ru')
+
+export type IGenerateBallotInput = Mutations.Meet.GenerateBallotForAnnualGeneralMeetDocument.IInput['data'];
+export type IGenerateBallotResult = Mutations.Meet.GenerateBallotForAnnualGeneralMeetDocument.IOutput[typeof Mutations.Meet.GenerateBallotForAnnualGeneralMeetDocument.name];
+
+/**
+ * Генерирует бюллетень для голосования
+ * @private Внутренняя функция, не экспортируется
+ */
+async function generateBallot(data: IGenerateBallotInput, options?: any): Promise<IGenerateBallotResult> {
+  const { answers: answersFromInput, ...restData } = data
+
+  // Подготавливаем массив ответов из голосов
+  const meetStore = useMeetStore()
+  const meet = await meetStore.loadMeet({
+    coopname: data.coopname,
+    hash: data.meet_hash
+  })
+
+  if (!meet?.processing?.questions?.length) {
+    throw new Error('Не удалось получить вопросы собрания')
+  }
+
+  // Создаем массив ответов на основе вопросов и голосов
+  const answers = meet.processing.questions.map((question, index) => {
+    const questionId = typeof question.id === 'number' ? question.id.toString() : question.id
+    const questionNumber = typeof question.number === 'number' ? question.number.toString() : question.number
+
+    return {
+      id: questionId,
+      number: questionNumber,
+      vote: answersFromInput[index].vote
+    }
+  })
+
+  const { [Mutations.Meet.GenerateBallotForAnnualGeneralMeetDocument.name]: generatedDocument } = await client.Mutation(
+    Mutations.Meet.GenerateBallotForAnnualGeneralMeetDocument.mutation,
+    {
+      variables: {
+        data: {
+          ...restData,
+          answers
+        },
+        options
+      }
+    }
+  );
+
+  return generatedDocument;
+}
+
+export function useVoteOnMeet() {
+  // Стор встреч для доступа к данным и методам загрузки
+  const meetStore = useMeetStore()
+
+  // Локальное состояние голосов
+  const votes = ref<Record<number, 'for' | 'against' | 'abstained'>>({})
+
+  // Текущее собрание для голосования (может быть из стора или переданное)
+  const currentVotingMeet = ref<IMeet | null>(null)
+
+  // Получаем активное собрание, приоритет у переданного собрания
+  const activeMeet = computed<IMeet | null>(() => {
+    return currentVotingMeet.value || meetStore.currentMeet
+  })
+
+  // Устанавливаем собрание для голосования
+  const setMeet = (meet: IMeet | null) => {
+    currentVotingMeet.value = meet
+  }
+
+  // Селекторы (computed)
+  const meetAgendaItems = computed(() => {
+    if (!activeMeet.value) return []
+    return activeMeet.value.processing?.questions || []
+  })
+
+  const allVotesSelected = computed(() => {
+    if (!meetAgendaItems.value.length) return false
+    return meetAgendaItems.value.every((_, index) => votes.value[index] !== undefined)
+  })
+
+  const isVotingNow = computed(() => {
+    if (activeMeet.value?.processing?.extendedStatus === Zeus.ExtendedMeetStatus.VOTING_IN_PROGRESS) return true
+    else return false
+ })
+
+  const isVotingNotStarted = computed(() => {
+    if (activeMeet.value?.processing?.extendedStatus === Zeus.ExtendedMeetStatus.WAITING_FOR_OPENING) return true
+    else return false
+  })
+
+  const isVotingEnded = computed(() => {
+    if (activeMeet.value?.processing?.extendedStatus === Zeus.ExtendedMeetStatus.VOTING_COMPLETED) return true
+    else return false
+  })
+
+  const showQuorumIndicator = computed(() => {
+    if (!activeMeet.value) return false
+    const status = activeMeet.value?.processing?.extendedStatus
+    return status === Zeus.ExtendedMeetStatus.VOTING_IN_PROGRESS
+  })
+
+  const formattedOpenDate = computed(() => {
+    if (!activeMeet.value?.processing?.meet?.open_at) return ''
+    return formatDateToLocalTimezone(activeMeet.value.processing.meet.open_at)
+  })
+
+  const formattedCloseDate = computed(() => {
+    if (!activeMeet.value?.processing?.meet?.close_at) return ''
+    return formatDateToLocalTimezone(activeMeet.value.processing.meet.close_at)
+  })
+
+  // Экшены
+  const resetVotes = () => {
+    votes.value = {}
+  }
+
+  const voteOnMeet = async (data: IVoteOnMeetInput): Promise<IVoteOnMeetResult> => {
+    const { [Mutations.Meet.VoteOnAnnualGeneralMeet.name]: result } = await client.Mutation(
+      Mutations.Meet.VoteOnAnnualGeneralMeet.mutation,
+      {
+        variables: {
+          data
+        }
+      }
+    )
+
+    // Обновляем данные собрания после голосования
+    if (data.coopname && data.hash) {
+      // Обновляем данные в сторе собраний
+      const updatedMeet = await meetStore.loadMeet({
+        coopname: data.coopname,
+        hash: data.hash
+      })
+
+      // Обновляем данные в локальном сторе, если используется отдельное собрание
+      if (currentVotingMeet.value) {
+        currentVotingMeet.value = updatedMeet
+      }
+    }
+
+    // Сбрасываем локальное состояние голосов
+    resetVotes()
+
+    return result
+  }
+
+  return {
+    // state
+    votes,
+    currentVotingMeet,
+
+    // getters
+    activeMeet,
+    meetAgendaItems,
+    isVotingNow,
+    allVotesSelected,
+    isVotingNotStarted,
+    isVotingEnded,
+    showQuorumIndicator,
+    formattedOpenDate,
+    formattedCloseDate,
+
+    // actions
+    setMeet,
+    voteOnMeet,
+    resetVotes,
+    generateBallot
+  }
+}

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

@@ -1,18 +1,3 @@
-import { client } from 'src/shared/api/client';
-import { Mutations } from '@coopenomics/sdk';
 
-export type IVoteOnMeetInput = Mutations.Meet.VoteOnAnnualGeneralMeet.IInput['data'];
-export type IVoteOnMeetResult = Mutations.Meet.VoteOnAnnualGeneralMeet.IOutput[typeof Mutations.Meet.VoteOnAnnualGeneralMeet.name];
-
-export async function voteOnMeet(data: IVoteOnMeetInput): Promise<IVoteOnMeetResult> {
-  const { [Mutations.Meet.VoteOnAnnualGeneralMeet.name]: result } = await client.Mutation(
-    Mutations.Meet.VoteOnAnnualGeneralMeet.mutation,
-    {
-      variables: {
-        data
-      }
-    }
-  );
-
-  return result;
-}
+export * from './composable'
+export * from './types'

package/src/features/Meet/VoteOnMeet/model/types.ts

@@ -0,0 +1,4 @@
+import { Mutations } from '@coopenomics/sdk';
+
+export type IVoteOnMeetInput = Mutations.Meet.VoteOnAnnualGeneralMeet.IInput['data'];
+export type IVoteOnMeetResult = Mutations.Meet.VoteOnAnnualGeneralMeet.IOutput[typeof Mutations.Meet.VoteOnAnnualGeneralMeet.name];

package/src/features/Meet/index.ts

@@ -0,0 +1,6 @@
+export * from './CreateMeet'
+export * from './SignNotification'
+export * from './VoteOnMeet'
+export * from './RestartMeet'
+export * from './CloseMeetWithDecision'
+export * from './GenerateSovietDecision'

package/src/features/User/LoginRedirect/ui/LoginRedirectPage.vue

@@ -0,0 +1,15 @@
+<template lang="pug">
+.q-pa-md.flex.flex-center
+  .column.q-gutter-md(style="max-width: 400px")
+
+    q-card(flat).q-pa-md
+      .text-h6.text-center ПОЖАЛУЙСТА, ВОЙДИТЕ, ЧТОБЫ ПРОДОЛЖИТЬ
+      //- .text-body1.text-center Пожалуйста, войдите в свой аккаунт, чтобы продолжить.
+
+
+      login-form
+</template>
+
+<script lang="ts" setup>
+import { LoginForm } from 'src/features/User/LoginUser/ui/LoginForm'
+</script>

package/src/features/User/LoginRedirect/ui/index.ts

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

package/src/features/User/LoginUser/ui/LoginForm/LoginForm.vue

@@ -41,6 +41,8 @@ import { useLoginUser } from 'src/features/User/LoginUser';
 import { FailAlert } from 'src/shared/api';
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
+import { useDesktopStore } from 'src/entities/Desktop/model';
+import { LocalStorage } from 'quasar';
 
 const router = useRouter()
 
@@ -49,6 +51,35 @@ const privateKey = ref('')
 const loading = ref(false)
 const currentUser = useCurrentUserStore()
 
+/**
+ * Функция для перехода по сохраненному URL после успешного входа
+ */
+function navigateToSavedUrl() {
+  if (process.env.CLIENT) {
+    // Проверяем наличие сохраненного URL для редиректа
+    const redirectUrl = LocalStorage.getItem('redirectAfterLogin') as string
+    console.log('login form redirect url', redirectUrl)
+
+    if (redirectUrl) {
+      // Удаляем сохраненный URL
+      LocalStorage.remove('redirectAfterLogin')
+
+      try {
+        // Пытаемся использовать router для навигации
+        const url = new URL(redirectUrl)
+        const path = url.pathname + url.search
+        console.log('Navigating with router to', path)
+        router.push(path)
+      } catch (e) {
+        console.error('Error parsing URL, using direct navigation', e)
+        window.location.href = redirectUrl
+      }
+
+      return true
+    }
+  }
+  return false
+}
 
 const submit = async () => {
   loading.value = true
@@ -59,7 +90,13 @@ const submit = async () => {
     if (!currentUser.isRegistrationComplete) {
       router.push({ name: 'signup' })
     } else {
-      router.push({ name: 'index' })
+      // Пробуем перейти по сохраненному URL
+      if (!navigateToSavedUrl()) {
+        // Если сохраненного URL нет, переходим на страницу по умолчанию
+        const desktops = useDesktopStore()
+        desktops.selectDefaultWorkspace()
+        desktops.goToDefaultPage(router)
+      }
     }
 
     loading.value = false

package/src/pages/Cooperative/ListOfMeets/ui/ListOfMeetsPage.vue

@@ -1,69 +1,44 @@
 <template lang="pug">
-div.q-pa-md
+div
   router-view(v-if="$route.name !== 'user-meets' && $route.name !== 'meets'")
   template(v-else)
     div.row.justify-center
       div.col-12
-        div.row.q-mb-md(v-if="canCreateMeet")
-          CreateMeet(@create="handleCreate")
-
-        MeetsTable(
+        div.row.q-pa-md(v-if="canCreateMeet")
+          CreateMeet
+        MeetCardsList(
           :meets="meets"
           :loading="loading"
-          @vote="handleVote"
-          @close="handleCloseMeet"
-          @restart="showRestartMeetDialog"
-          @view="navigateToMeetDetails"
         )
-    
+
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, computed, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { MeetsTable } from 'src/widgets/Meets/MeetsTable'
+import { onMounted, computed, watch } from 'vue'
+import { useRoute } from 'vue-router'
+import { MeetCardsList } from 'src/widgets/Meets/MeetCardsList'
 import { CreateMeet } from 'src/features/Meet/CreateMeet'
-import { useMeetManagement } from '../model'
-import type { IMeet } from 'src/entities/Meet'
+import { useMeetStore } from 'src/entities/Meet'
 import { useCurrentUserStore } from 'src/entities/User'
+import { FailAlert } from 'src/shared/api'
 
 const route = useRoute()
-const router = useRouter()
 const coopname = computed(() => route.params.coopname as string)
+const meetStore = useMeetStore()
 
 const {isChairman, isMember} = useCurrentUserStore()
 
-const {
-  meets,
-  loading,
-  loadMeets,
-  handleCreateMeet,
-  handleCloseMeet,
-  handleVote
-} = useMeetManagement(coopname.value)
-
-// Диалоги
-const currentMeetToRestart = ref<IMeet | null>(null)
-
-// Обработчики
-const handleCreate = async (formData: any) => {
-  const success = await handleCreateMeet(formData)
-  return success
-}
-
-const showRestartMeetDialog = (meet: IMeet) => {
-  currentMeetToRestart.value = meet
-}
+// Данные напрямую из стора
+const meets = computed(() => meetStore.meets)
+const loading = computed(() => meetStore.loading)
 
-// Навигация на детальную страницу собрания
-const navigateToMeetDetails = (meet: IMeet) => {
-  router.push({
-    name: route.name === 'meets' ? 'meet-details' : 'user-meet-details',
-    params: {
-      coopname: coopname.value,
-      hash: meet.hash
-    }
-  })
+// Загрузка списка собраний
+const loadMeets = async () => {
+  try {
+    await meetStore.loadMeets({ coopname: coopname.value })
+  } catch (e: any) {
+    FailAlert(e)
+  }
 }
 
 // Проверка разрешений
@@ -87,4 +62,5 @@ watch(
     }
   }
 )
+
 </script>

package/src/pages/Cooperative/MeetDetails/ui/MeetDetailsPage.vue

@@ -1,47 +1,74 @@
 <template lang="pug">
-div.q-pa-md
+q-card(flat).card-container.q-pa-md
   div(v-if="loading")
     q-skeleton(type="rect" height="200px" class="q-mb-md")
     q-skeleton(type="rect" height="100px" v-for="i in 3" :key="i" class="q-mb-md")
 
+
   div(v-else-if="!meet")
     div.text-h5.text-center Собрание не найдено
 
+
   div(v-else)
-    MeetDetailsHeader(:meet="meet")
-    
-    MeetDetailsActions(
-      :meet="meet"
-      :coopname="coopname"
-      :meet-hash="meetHash"
-      class="q-mt-md"
-    )
-    
-    MeetDetailsAgenda(
-      :meet="meet"
-      class="q-mt-md"
-    )
-    
-    MeetDetailsVoting(
-      :meet="meet"
-      :coopname="coopname"
-      :meet-hash="meetHash"
-      class="q-mt-md"
-    )
+    div.row.q-col-gutter-md.justify-center
+      div.col-12.col-md-12
+        div.info-card.hover
+          MeetDetailsInfo(:meet="meet")
+            template(#actions)
+              MeetDetailsActions(
+                :meet="meet"
+                :coopname="coopname"
+                :meet-hash="meetHash"
+              )
+
+        // Индикатор явки и статус собрания
+        q-card(v-if="showQuorumIndicator" flat).q-mt-lg
+          MeetQuorumIndicator(:meet="meet")
+
+        // Показываем результаты собрания, если оно завершено
+        template(v-if="isProcessed")
+          q-card(flat).info-card.hover.q-mt-lg
+            MeetDetailsResults(
+              :meet="meet"
+            )
+
+        // Показываем повестку и голосование, если собрание еще не завершено
+        template(v-else)
+          q-card(v-if="showAgenda || isVotingNow" flat).info-card.hover.q-mt-lg
+            // Показываем повестку, если голосование еще не началось
+            template(v-if="showAgenda")
+              MeetDetailsAgenda(
+                :meet="meet"
+                :coopname="coopname"
+                :meet-hash="meetHash"
+              )
+
+            // Показываем голосование, если оно началось
+            template(v-if="isVotingNow")
+              MeetDetailsVoting(
+                :meet="meet"
+                :coopname="coopname"
+                :meet-hash="meetHash"
+              )
+
+
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, computed } from 'vue'
+import { onMounted, ref, computed, onUnmounted } from 'vue'
 import { useRoute } from 'vue-router'
-import { MeetDetailsHeader } from 'src/widgets/Meets/MeetDetailsHeader'
+import { MeetDetailsInfo } from 'src/widgets/Meets/MeetDetailsInfo'
 import { MeetDetailsActions } from 'src/widgets/Meets/MeetDetailsActions'
 import { MeetDetailsAgenda } from 'src/widgets/Meets/MeetDetailsAgenda'
 import { MeetDetailsVoting } from 'src/widgets/Meets/MeetDetailsVoting'
+import { MeetDetailsResults } from 'src/widgets/Meets/MeetDetailsResults'
 import { useMeetStore } from 'src/entities/Meet'
 import { FailAlert } from 'src/shared/api'
-import type { IMeet } from 'src/entities/Meet'
 import { useDesktopStore } from 'src/entities/Desktop/model'
 import { useBackButton } from 'src/shared/lib/navigation'
+import { useVoteOnMeet } from 'src/features/Meet/VoteOnMeet'
+import { MeetQuorumIndicator } from 'src/widgets/Meets/MeetQuorumIndicator'
+import { Zeus } from '@coopenomics/sdk'
 
 const route = useRoute()
 const meetStore = useMeetStore()
@@ -50,17 +77,35 @@ const desktopStore = useDesktopStore()
 const coopname = computed(() => route.params.coopname as string)
 const meetHash = computed(() => route.params.hash as string)
 
-const meet = ref<IMeet | null>(null)
+const meet = computed(() => meetStore.currentMeet)
 const loading = ref(true)
 
+// Проверяем, завершено ли собрание
+const isProcessed = computed(() => {
+  return !!meet.value?.processed
+})
+
+const showAgenda = computed(() => {
+  return meet.value?.processing?.extendedStatus === Zeus.ExtendedMeetStatus.WAITING_FOR_OPENING
+})
+
+// Используем хук для управления голосованием
+const { isVotingNow, setMeet, showQuorumIndicator } = useVoteOnMeet()
+
+let intervalId: ReturnType<typeof setInterval> | null = null
+
 const loadMeetDetails = async () => {
-  loading.value = true
   try {
-    const result = await meetStore.loadMeet({
+    await meetStore.loadMeet({
       coopname: coopname.value,
       hash: meetHash.value
     })
-    meet.value = result
+
+    // Устанавливаем собрание в композабл после загрузки
+    if (meet.value) {
+      setMeet(meet.value)
+    }
+
   } catch (error: any) {
     FailAlert(error)
   } finally {
@@ -83,6 +128,17 @@ useBackButton({
 
 // Загрузка деталей собрания
 onMounted(() => {
+  loading.value = true
   loadMeetDetails()
+  intervalId = setInterval(() => {
+    loadMeetDetails()
+  }, 15000)
+})
+
+onUnmounted(() => {
+  if (intervalId) {
+    clearInterval(intervalId)
+    intervalId = null
+  }
 })
 </script>

package/src/pages/PermissionDenied/PermissionDenied.vue

@@ -8,7 +8,7 @@ div.row.justify-center
       div(class="text-h4") Недостаточно прав доступа
 
     q-card-actions(align="center")
-      q-btn(label="Вернуться" color="secondary" icon="fa fa-arrow-left" @click="goBack")
+      q-btn(label="Вернуться" color="primary" icon="fa fa-arrow-left" @click="goBack")
 </template>
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'

package/src/processes/init-app/index.ts

@@ -6,6 +6,7 @@ import { useBranchOverlayProcess } from '../watch-branch-overlay'
 import { setupNavigationGuard } from '../navigation-guard-setup'
 import { useInitExtensionsProcess } from 'src/processes/init-installed-extensions'
 import { applyThemeFromStorage } from 'src/shared/lib/utils'
+import { useSessionStore } from 'src/entities/Session'
 
 export async function useInitAppProcess(router: Router) {
   applyThemeFromStorage()
@@ -16,14 +17,20 @@ export async function useInitAppProcess(router: Router) {
   await desktops.healthCheck()
   await desktops.loadDesktop()
 
-  // Выбираем активный рабочий стол (например, participant)
-  desktops.selectWorkspace('participant')
+  // Регистрируем маршруты рабочего стола до выбора активного рабочего стола
+  desktops.registerWorkspaceMenus(router)
 
-  useBranchOverlayProcess()
   await useInitWalletProcess().run()
 
-  // Регистрируем маршруты рабочего стола
-  desktops.registerWorkspaceMenus(router)
+  // Выбираем рабочий стол на основе прав пользователя или сохраненного выбора
+  // только если пользователь авторизован
+  const session = useSessionStore()
+  if (session.isAuth) {
+    desktops.selectDefaultWorkspace()
+  }
+
+  useBranchOverlayProcess()
+
   setupNavigationGuard(router)
 
   await useInitExtensionsProcess(router)

package/src/processes/navigation-guard-setup/index.ts

@@ -3,12 +3,21 @@ import { useSessionStore } from 'src/entities/Session'
 import { useCurrentUserStore } from 'src/entities/User'
 import { useDesktopStore } from 'src/entities/Desktop/model'
 import { useSystemStore } from 'src/entities/System/model'
+import { LocalStorage } from 'quasar'
 
 function hasAccess(to, userAccount) {
   if (!to.meta?.roles || to.meta?.roles.length === 0) return true
   return userAccount && to.meta?.roles.includes(userAccount.role)
 }
 
+// Функция для получения URL для редиректа
+function getRedirectUrl(router: Router, to: any): string {
+  if (process.env.CLIENT) {
+    return router.resolve(to).href
+  }
+  return ''
+}
+
 export function setupNavigationGuard(router: Router) {
   const desktops = useDesktopStore()
   const session = useSessionStore()
@@ -26,12 +35,35 @@ export function setupNavigationGuard(router: Router) {
 
     // редирект с index
     if (to.name === 'index') {
-      const homePage =
-        session.isAuth && currentUser.isRegistrationComplete
-          ? desktops.currentDesktop?.authorizedHome
-          : desktops.currentDesktop?.nonAuthorizedHome
+      // Убеждаемся, что правильный рабочий стол выбран
+      if (session.isAuth && currentUser.isRegistrationComplete) {
+        // Если рабочий стол не выбран - выбираем по правам пользователя
+        if (!desktops.activeWorkspaceName) {
+          desktops.selectDefaultWorkspace()
+        }
+
+        // Переходим на маршрут по умолчанию для выбранного рабочего стола
+        desktops.goToDefaultPage(router)
+        // next(false)
+        return
+      } else {
+        // Если пользователь не авторизован, используем nonAuthorizedHome
+        const homePage = desktops.currentDesktop?.nonAuthorizedHome
+        next({ name: homePage, params: { coopname: info.coopname } })
+        return
+      }
+    }
 
-      next({ name: homePage, params: { coopname: info.coopname } })
+    // Проверка авторизации для маршрутов, требующих входа
+    if (to.meta?.requiresAuth && !session.isAuth) {
+      // Сохраняем целевой URL для редиректа после входа
+      if (process.env.CLIENT) {
+        // Получаем URL для редиректа
+        const redirectUrl = getRedirectUrl(router, to)
+        LocalStorage.set('redirectAfterLogin', redirectUrl)
+      }
+      // Перенаправляем на страницу входа
+      next({ name: 'login-redirect', params: { coopname: info.coopname } })
       return
     }