@coopenomics/desktop 2.2.10 → 2025.4.29

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

@@ -0,0 +1,87 @@
+<!-- MainHeader.vue -->
+<template lang="pug">
+q-header(bordered :class="headerClass").header
+  q-toolbar()
+    q-btn(v-if="loggedIn" stretch icon="menu" flat @click="emitToggleLeftDrawer")
+    BackButton(v-if="loggedIn")
+    q-toolbar-title()
+
+    SettingsDropdown(:isMobile="isMobile" :isChairman="isChairman" :isMember="isMember")
+
+    template(v-if="!loggedIn")
+      q-btn(
+        v-if="showRegisterButton && !is('signup') && !is('install')"
+        color="primary"
+        stretch
+        :size="isMobile ? 'sm' : 'lg'"
+        @click="signup"
+      )
+        span.q-pr-sm регистрация
+        i.fa-solid.fa-right-to-bracket
+
+      q-btn(
+        v-if="showRegisterButton && is('signup')"
+        color="primary"
+        stretch
+        :size="isMobile ? 'sm' : 'lg'"
+        @click="login"
+      )
+        span.q-pr-sm вход
+        i.fa-solid.fa-right-to-bracket
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+import { useQuasar } from 'quasar'
+import { useCurrentUserStore } from 'src/entities/User'
+import { useSessionStore } from 'src/entities/Session'
+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 './HeaderStyles.scss'
+
+const router = useRouter()
+const route = useRoute()
+const $q = useQuasar()
+const session = useSessionStore()
+const { isMobile } = useWindowSize()
+const emit = defineEmits(['toggle-left-drawer'])
+
+// Получаем информацию для навигации назад
+// const coopTitle = computed(() => process.env.COOP_SHORT_NAME)
+
+const isDark = computed(() => $q.dark.isActive)
+const headerClass = computed(() =>
+  isDark.value ? 'text-white bg-dark' : 'text-black bg-light'
+)
+const currentUser = useCurrentUserStore()
+const loggedIn = computed(
+  () => currentUser.isRegistrationComplete && session.isAuth
+)
+
+const isChairman = computed(() => currentUser.userAccount?.role === 'chairman')
+const isMember = computed(() => currentUser.userAccount?.role === 'member')
+
+const showRegisterButton = computed(() => {
+  if (!loggedIn.value) {
+    return config.registrator.showRegisterButton
+  }
+  return false
+})
+
+const is = (what: string) => route.name === what
+
+const signup = () => {
+  router.push({ name: 'signup' })
+}
+
+const login = () => {
+  router.push({ name: 'signin' })
+}
+
+const emitToggleLeftDrawer = () => {
+  emit('toggle-left-drawer')
+}
+</script>

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

@@ -0,0 +1,29 @@
+<!-- UserSettingsHeader.vue -->
+<template lang="pug">
+q-header(bordered).flex.bg-gradient-dark
+  q-toolbar
+    q-btn(flat icon="fas fa-chevron-left" stretch @click="open('index')")
+    q-tabs(
+      dense
+      switch-indicator
+      inline-label
+      align="justify"
+      active-class="bg-teal"
+      active-bg-color="teal"
+      active-color="white"
+      indicator-color="secondary"
+      class="header-tab-container"
+    )
+      q-route-tab(name="Реквизиты" label="Реквизиты" :to="{name: 'user-payment-methods'}" )
+</template>
+
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+import './HeaderStyles.scss'
+
+const router = useRouter()
+
+const open = (name: string) => {
+  router.push({name})
+}
+</script>

package/src/widgets/Header/CommonHeader/index.ts

@@ -1 +1 @@
-export { default as Header} from './Header.vue'
+export { default as Header } from './Header.vue'

package/src/widgets/Header/SettingsDropdown/SettingsDropdown.vue

@@ -3,12 +3,6 @@ q-btn-dropdown(flat :size="isMobile ? 'sm' : 'md'" :dense="isMobile" stretch ico
   q-list
     ToogleDarkLight(:isMobile="isMobile" :showText="true")
 
-    q-item(v-if="loggedIn" flat clickable v-close-popup @click="open('user-payment-methods')")
-      q-item-section
-        q-item-label
-          q-icon(name="fa-solid fa-wrench").q-mr-sm
-          span.font10px НАСТРОЙКИ ПАЙЩИКА
-
     q-item(v-if="loggedIn && (isChairman || isMember)" flat clickable v-close-popup @click="open('members')")
       q-item-section
         q-item-label

package/src/widgets/{Request → Marketplace}/SupplyOrderRequestCard/ui/Base/Base.vue

@@ -11,7 +11,6 @@ import {
   SeventhStep,
   EightStep,
 } from '../Steps'
-import { STORAGE_URL } from 'src/shared/config'
 
 //TODO изменить на обязательный импорт с типом
 const props = defineProps<{
@@ -54,7 +53,7 @@ const src = computed(() => {
   if (preview && preview.startsWith('https://')) {
     return preview // Превью уже содержит HTTPS, оставляем его как есть
   } else {
-    return STORAGE_URL + preview // Иначе, добавляем config.storageUrl
+    return process.env.STORAGE_URL + preview // Иначе, добавляем config.storageUrl
   }
 })
 </script>

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

@@ -0,0 +1,51 @@
+<template lang="pug">
+q-card(flat class="card-container q-pa-md" v-if="canManageMeet")
+  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="Закрыть собрание (Секретарь)"
+        @click="closeMeetBySecretary"
+        :loading="isProcessing"
+      )
+    div.col-12.col-md-auto(v-if="canCloseByPresider")
+      q-btn(
+        color="negative"
+        icon="fa-solid fa-door-closed"
+        label="Закрыть собрание (Председатель)"
+        @click="closeMeetByPresider"
+        :loading="isProcessing"
+      )
+    div.col-12.col-md-auto(v-if="canRestartMeet")
+      RestartMeet(
+        :meet="meet"
+        show-button
+        @restart="handleRestartMeet"
+      )
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { RestartMeet } from 'src/features/Meet/RestartMeet'
+import type { IMeet } from 'src/entities/Meet'
+import { useMeetDetailsManagement } from 'src/features/Meet/MeetDetailsManagement'
+
+const props = defineProps<{
+  meet: IMeet
+  coopname: string
+  meetHash: string
+}>()
+
+const isProcessing = ref(false)
+
+const {
+  canManageMeet,
+  canCloseBySecretary,
+  canCloseByPresider,
+  canRestartMeet,
+  closeMeetBySecretary,
+  closeMeetByPresider,
+  handleRestartMeet
+} = useMeetDetailsManagement(props.meet, props.coopname, props.meetHash, isProcessing)
+</script> 

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

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

package/src/widgets/Meets/MeetDetailsActions/model.ts

@@ -0,0 +1,46 @@
+import { computed } from 'vue'
+import type { IMeet } from 'src/entities/Meet'
+import moment from 'moment-with-locales-es6'
+
+moment.locale('ru')
+
+export const useMeetDetailsActions = (meet: IMeet) => {
+  const canManageMeet = computed(() => true) // Здесь можно добавить проверку ролей
+
+  const canCloseBySecretary = computed(() => {
+    if (!meet?.processing?.meet) return false
+    
+    const now = moment()
+    const closeAt = moment(meet.processing.meet.close_at)
+    
+    const isAfterCloseDate = now.isAfter(closeAt)
+    const isQuorumPassed = meet.processing.meet.quorum_passed === true
+    const isAuthorized = meet.processing.meet.status === 'authorized'
+    
+    return isAfterCloseDate && isQuorumPassed && isAuthorized
+  })
+
+  const canCloseByPresider = computed(() => {
+    if (!meet?.processing?.meet) return false
+    return meet.processing.meet.status === 'preclose'
+  })
+
+  const canRestartMeet = computed(() => {
+    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'
+  })
+
+  return {
+    canManageMeet,
+    canCloseBySecretary,
+    canCloseByPresider,
+    canRestartMeet
+  }
+} 

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

@@ -0,0 +1,29 @@
+<template lang="pug">
+q-card(flat class="card-container q-pa-md")
+  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.text-weight-bold Решение
+          div.text-body2 {{ item.decision }}
+</template>
+
+<script setup lang="ts">
+import type { IMeet } from 'src/entities/Meet'
+import { computed } from 'vue'
+
+const props = defineProps<{
+  meet: IMeet
+}>()
+
+const meetAgendaItems = computed(() => {
+  if (!props.meet) return []
+  return props.meet.processing?.questions || []
+})
+</script> 

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

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

package/src/widgets/Meets/MeetDetailsHeader/MeetDetailsHeader.vue

@@ -0,0 +1,40 @@
+<template lang="pug">
+q-card(flat class="card-container q-pa-md")
+  div.row.items-center
+    div.col-12
+      div.text-h5.q-mb-xs Общее собрание {{ meet.hash.substring(0, 10) }}
+      q-badge(color="primary" class="meet-status") {{ meetStatus }}
+  div.row.q-mt-md
+    div.col-12
+      MeetInfoCard(:meet="meet")
+</template>
+
+<script setup lang="ts">
+import { MeetInfoCard } from '../MeetInfoCard'
+import type { IMeet } from 'src/entities/Meet'
+import { computed } from 'vue';
+
+const props = defineProps<{
+  meet: IMeet
+}>()
+
+const meetStatus = computed(() => {
+  if (!props.meet?.processing?.meet?.status) return 'Неизвестный статус'
+  
+  const statusMap = {
+    'created': 'Ожидание решения совета',
+    'authorized': 'Утверждено',
+    'preclose': 'На закрытии',
+    'closed': 'Закрыто'
+  }
+  
+  return statusMap[props.meet.processing.meet.status] || 'Неизвестный статус'
+})
+</script>
+
+<style lang="scss" scoped>
+.meet-status {
+  font-size: 14px;
+  padding: 4px 8px;
+}
+</style> 

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

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

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

@@ -0,0 +1,77 @@
+<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 }}
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import type { IMeet } from 'src/entities/Meet'
+import { useMeetDetailsVoting } from './model'
+
+const props = defineProps<{
+  meet: IMeet
+  coopname: string
+  meetHash: string
+}>()
+
+const isVoting = ref(false)
+const votes = ref<Record<number, 'for' | 'against' | 'abstained'>>({})
+
+const {
+  canVote,
+  meetAgendaItems,
+  allVotesSelected,
+  isVotingNotStarted,
+  isVotingEnded,
+  formattedOpenDate,
+  formattedCloseDate,
+  submitVote
+} = useMeetDetailsVoting(props.meet, props.coopname, props.meetHash, votes, isVoting)
+</script> 

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

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

package/src/widgets/Meets/MeetDetailsVoting/model.ts

@@ -0,0 +1,117 @@
+import { computed, type Ref } from 'vue'
+import type { IMeet } from 'src/entities/Meet'
+import { useMeetStore } from 'src/entities/Meet'
+import { useSessionStore } from 'src/entities/Session'
+import { FailAlert, SuccessAlert } from 'src/shared/api'
+import { voteOnMeet, type IVoteOnMeetInput } from 'src/features/Meet/VoteOnMeet'
+import { generateBallot } from 'src/features/Meet/GenerateBallot'
+import { useSignDocument } from 'src/shared/lib/document'
+import moment from 'moment-with-locales-es6'
+
+moment.locale('ru')
+
+export const useMeetDetailsVoting = (
+  meet: IMeet,
+  coopname: string,
+  meetHash: string,
+  votes: Ref<Record<number, 'for' | 'against' | 'abstained'>>,
+  isVoting: Ref<boolean>
+) => {
+  const meetStore = useMeetStore()
+  const sessionStore = useSessionStore()
+  const { signDocument } = useSignDocument()
+
+  const meetAgendaItems = computed(() => {
+    if (!meet) return []
+    return meet.processing?.questions || []
+  })
+
+  const canVote = computed(() => {
+    if (!meet?.processing?.meet) return false
+
+    const isAuthorized = meet.processing.meet.status === 'authorized'
+    
+    const now = moment()
+    const openAt = moment(meet.processing.meet.open_at)
+    const closeAt = moment(meet.processing.meet.close_at)
+    
+    const isWithinTimeframe = now.isAfter(openAt) && now.isBefore(closeAt)
+
+    return isAuthorized && isWithinTimeframe
+  })
+
+  const allVotesSelected = computed(() => {
+    if (!meetAgendaItems.value.length) return false
+    return meetAgendaItems.value.every((_, index) => votes.value[index] !== undefined)
+  })
+
+  const isVotingNotStarted = computed(() => {
+    if (!meet?.processing?.meet?.open_at) return false
+    const now = moment()
+    const openAt = moment(meet.processing.meet.open_at)
+    return now.isBefore(openAt)
+  })
+
+  const isVotingEnded = computed(() => {
+    if (!meet?.processing?.meet?.close_at) return false
+    const now = moment()
+    const closeAt = moment(meet.processing.meet.close_at)
+    return now.isAfter(closeAt)
+  })
+
+  const formattedOpenDate = computed(() => {
+    if (!meet?.processing?.meet?.open_at) return ''
+    return moment(meet.processing.meet.open_at).format('DD.MM.YYYY HH:mm')
+  })
+
+  const formattedCloseDate = computed(() => {
+    if (!meet?.processing?.meet?.close_at) return ''
+    return moment(meet.processing.meet.close_at).format('DD.MM.YYYY HH:mm')
+  })
+
+  const submitVote = async () => {
+    if (!meet || !allVotesSelected.value || !canVote.value) return
+
+    isVoting.value = true
+    try {
+      const votesData = meetAgendaItems.value.map((item, index) => ({
+        question_id: item.id,
+        vote: votes.value[index]
+      }))
+
+      const generatedBallot = await generateBallot({
+        coopname,
+        username: sessionStore.username,
+      })
+
+      const signedBallot = await signDocument(generatedBallot)
+
+      const vote: IVoteOnMeetInput = {
+        coopname,
+        hash: meetHash,
+        ballot: signedBallot,
+        username: sessionStore.username,
+        votes: votesData
+      }
+
+      await voteOnMeet(vote)
+      SuccessAlert('Ваш голос успешно отправлен')
+      await meetStore.loadMeet({ coopname, hash: meetHash })
+    } catch (error: any) {
+      FailAlert(error)
+    } finally {
+      isVoting.value = false
+    }
+  }
+
+  return {
+    canVote,
+    meetAgendaItems,
+    allVotesSelected,
+    isVotingNotStarted,
+    isVotingEnded,
+    formattedOpenDate,
+    formattedCloseDate,
+    submitVote
+  }
+} 

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

@@ -0,0 +1,38 @@
+<template lang="pug">
+div.row.q-pa-md
+  div.col-12
+    q-card(flat)
+      q-card-section
+        div.text-h6 Информация о собрании
+        div.q-mt-sm
+          div.row
+            div.col-2.text-weight-bold Статус:
+            div.col {{ meet.processing?.meet?.status }}
+
+          div.row
+            div.col-2.text-weight-bold Инициатор:
+            div.col {{ meet.processing?.meet?.initiator }}
+          div.row
+            div.col-2.text-weight-bold Председатель:
+            div.col {{ meet.processing?.meet?.presider }}
+          div.row
+            div.col-2.text-weight-bold Секретарь:
+            div.col {{ meet.processing?.meet?.secretary }}
+          div.row
+            div.col-2.text-weight-bold Кворум:
+            div.col {{ meet.processing?.meet?.quorum_percent }}%
+          div.row
+            div.col-2.text-weight-bold Текущий кворум:
+            div.col {{ meet.processing?.meet?.current_quorum_percent }}%
+          div.row
+            div.col-2.text-weight-bold Кворум достигнут:
+            div.col {{ meet.processing?.meet?.quorum_passed ? 'Да' : 'Нет' }}
+</template>
+
+<script setup lang="ts">
+import type { IMeet } from 'src/entities/Meet'
+
+defineProps<{
+  meet: IMeet
+}>()
+</script>

package/src/widgets/Meets/MeetInfoCard/ui/index.ts

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