@coopenomics/desktop 2.2.10 → 2025.5.2

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

@@ -1,203 +1,38 @@
 <!-- Header.vue -->
 <template lang="pug">
 div
-  q-header(v-if="!matched('cooperative-settings') && !matched('user-settings') && !matched('extstore')" bordered :class="headerClass").header
-    q-toolbar()
-      q-btn(v-if="loggedIn && showDrawer" stretch icon="menu" flat @click="emitToggleLeftDrawer")
-      q-btn(v-if="loggedIn && !showDrawer" stretch icon="fas fa-chevron-left" flat @click="goTo('index')")
-
-      q-toolbar-title()
-        q-btn(:size="isMobile ? 'md' : 'lg'" flat @click="goTo('index')")
-          span(v-if="showDrawer") {{ COOP_SHORT_NAME }}
-
-      SettingsDropdown(:isMobile="isMobile" :isChairman="isChairman" :isMember="isMember")
-
-      template(v-if="!loggedIn")
-        q-btn(
-          v-if="showRegisterButton && !is('signup') && !is('install')"
-          color="primary"
-          class="btn-menu"
-          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"
-          class="btn-menu"
-          stretch
-          :size="isMobile ? 'sm' : 'lg'"
-          @click="login"
-        )
-          span.q-pr-sm вход
-          i.fa-solid.fa-right-to-bracket
-
-  q-header(v-if="matched('user-settings')" 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"
-        style="height: 50px !important; overflow-x: auto;"
-      )
-        q-route-tab(name="Реквизиты" label="Реквизиты" :to="{name: 'user-payment-methods'}" )
-
-  q-header(bordered v-if="matched('cooperative-settings')").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"
-        style="height: 50px !important; overflow-x: auto;"
-      )
-        q-route-tab(name="Совет" label="Совет" :to="{name: 'members'}" )
-        q-route-tab(name="Кооперативные участки" label="Кооперативные участки" :to="{name: 'branches'}" )
-        q-route-tab(name="Фонды накопления" label="Фонды накопления" :to="{name: 'accumulation-funds'}" )
-        q-route-tab(name="Фонды списания" label="Фонды списания" :to="{name: 'expense-funds'}" )
-        q-route-tab(name="Взносы" label="Взносы" :to="{name: 'initial-contributions'}" )
-        q-route-tab(name="Контакты" label="Контакты" :to="{name: 'change-contacts'}" )
-
-  q-header(bordered v-if="matched('extstore')").bg-gradient-dark
-    q-toolbar
-
-      q-btn(flat icon="fas fa-chevron-left" stretch @click="backFromAppstore")
-      q-tabs(
-        dense
-        switch-indicator
-        inline-label
-        align="justify"
-        active-class="bg-teal"
-        active-bg-color="teal"
-        active-color="white"
-        indicator-color="secondary"
-        style="height: 50px !important; overflow-x: auto;"
-      )
-
-        q-route-tab(name="Все приложения" label="Все приложения" :to="{name: 'extstore-showcase'}" )
-        q-route-tab(name="Установленные" label="Установленные" :to="{name: 'appstore-installed'}" )
-
-  </template>
-
-  <script setup lang="ts">
-  import { computed } from 'vue'
-  import { useRouter, useRoute } from 'vue-router'
-  import { useQuasar } from 'quasar'
-  import { COOP_SHORT_NAME } from 'src/shared/config'
-  import { useCurrentUserStore } from 'src/entities/User'
-  import { useSessionStore } from 'src/entities/Session'
-  import config from 'src/app/config'
-  import { useWindowSize } from 'vue-window-size'
-  import { SettingsDropdown } from 'src/widgets/Header/SettingsDropdown'
-
-  const router = useRouter()
-  const route = useRoute()
-  const $q = useQuasar()
-  const session = useSessionStore()
-  const { width } = useWindowSize()
-  const emit = defineEmits(['toggle-left-drawer'])
-
-  const isDark = computed(() => $q.dark.isActive)
-  const headerClass = computed(() =>
-    isDark.value ? 'text-white bg-dark' : 'text-black bg-light'
-  )
-  const isMobile = computed(() => width.value < 768)
-  const currentUser = useCurrentUserStore()
-  const loggedIn = computed(
-    () => currentUser.isRegistrationComplete && session.isAuth
+  MainHeader(
+    v-if="!matched('cooperative-settings') && !matched('user-settings') && !matched('extstore')"
+    @toggle-left-drawer="emitToggleLeftDrawer"
   )
-
-  const isChairman = computed(() => currentUser.userAccount?.role === 'chairman')
-  const isMember = computed(() => currentUser.userAccount?.role === 'member')
-
-  const open = (name: string) => {
-    router.push({name})
-  }
-
-  defineProps({
-    showDrawer: {
-      type: Boolean,
-      required: true
-    }
-  })
-
-  const showRegisterButton = computed(() => {
-    if (!loggedIn.value) {
-      return config.registrator.showRegisterButton
-    }
-    return false
-  })
-
-  const is = (what: string) => route.name === what
-
-  const goTo = (name: string) => {
-    router.push({ name })
-  }
-
-  const signup = () => {
-    router.push({ name: 'signup' })
-  }
-
-  const login = () => {
-    router.push({ name: 'signin' })
-  }
-
-  const emitToggleLeftDrawer = () => {
-    emit('toggle-left-drawer')
-  }
-
-  const backFromAppstore = () => {
-    if (is('extension-install') || is('extension-settings'))
-      open('one-extension')
-    else if (is('one-extension'))
-      open('extstore-showcase')
-    else open('index')
-  }
-
-
-  const matched = (what: string) => {
-    return route.matched.find(el => el.name === what)
-  }
-
-
+  UserSettingsHeader(v-if="matched('user-settings')")
+  CooperativeSettingsHeader(v-if="matched('cooperative-settings')")
+  ExtstoreHeader(v-if="matched('extstore')")
+</template>
+
+<script setup lang="ts">
+import { useRoute } from 'vue-router'
+import MainHeader from './MainHeader.vue'
+import UserSettingsHeader from './UserSettingsHeader.vue'
+import CooperativeSettingsHeader from './CooperativeSettingsHeader.vue'
+import ExtstoreHeader from './ExtstoreHeader.vue'
+import './HeaderStyles.scss'
+
+defineProps({
+  showDrawer: {
+    type: Boolean,
+    required: true
+  }
+})
+
+const emit = defineEmits(['toggle-left-drawer'])
+const route = useRoute()
+
+const matched = (what: string) => {
+  return route.matched.find(el => el.name === what)
+}
+
+const emitToggleLeftDrawer = () => {
+  emit('toggle-left-drawer')
+}
 </script>
-
-  <style lang="scss">
-  .btn-title {
-    font-size: 20px;
-  }
-
-  .btn-menu {
-    font-size: 20px;
-    height: 60px;
-  }
-
-  .menu {
-    right: 0px;
-    z-index: 1000;
-  }
-
-  .q-toolbar {
-    padding-left: 0px !important;
-    padding-right: 0px !important;
-  }
-
-  .q-toolbar__title {
-    padding: 0px !important;
-  }
-  </style>

package/src/widgets/Header/CommonHeader/HeaderStyles.scss

@@ -0,0 +1,22 @@
+.btn-title {
+  font-size: 20px;
+}
+
+.menu {
+  right: 0px;
+  z-index: 1000;
+}
+
+.q-toolbar {
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+}
+
+.q-toolbar__title {
+  padding: 0px !important;
+}
+
+.header-tab-container {
+  height: 50px !important;
+  overflow-x: auto;
+}

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

@@ -0,0 +1,88 @@
+<!-- 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'
+// import { env } from 'src/shared/config'
+
+const router = useRouter()
+const route = useRoute()
+const $q = useQuasar()
+const session = useSessionStore()
+const { isMobile } = useWindowSize()
+const emit = defineEmits(['toggle-left-drawer'])
+
+// Получаем информацию для навигации назад
+// const coopTitle = computed(() => 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,7 @@ import {
   SeventhStep,
   EightStep,
 } from '../Steps'
-import { STORAGE_URL } from 'src/shared/config'
+import { env } from 'src/shared/config'
 
 //TODO изменить на обязательный импорт с типом
 const props = defineProps<{
@@ -54,7 +54,7 @@ const src = computed(() => {
   if (preview && preview.startsWith('https://')) {
     return preview // Превью уже содержит HTTPS, оставляем его как есть
   } else {
-    return STORAGE_URL + preview // Иначе, добавляем config.storageUrl
+    return 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'