@coopenomics/desktop 2.2.10 → 2025.4.29

package/src/features/Branch/SelectBranch/ui/SelectBranchOverlay.vue

@@ -1,108 +1,55 @@
 <template lang="pug">
-div
-  q-dialog(v-model="isVisible" persistent :maximized="true" )
-    ModalBase(:title="title" :show_close="false")
-      div.row.justify-center
-        div(style="padding-bottom: 100px;").col-md-8.col-col-xs-12
-
-          div(v-if="step == 1")
-            p.q-mt-lg Кооператив перешёл на двухэтапную систему управления на основании общего собрания уполномоченных председателей кооперативных участков. На первом этапе пайщики принимают участие в голосовии при выбранном кооперативном участке, а на втором - уполномоченный ими председатель голосует на общем собрании уполномоченных. В связи с этим, выберите кооперативный участок, который наиболее удобен по местоположению:
-            Form(:handler-submit="next" :is-submitting="isSubmitting" :showSubmit="!isLoading" :showCancel="false" :button-submit-txt="'Продолжить'" @cancel="clear").q-pa-md
-              BranchSelector(
-                v-model:selectedBranch="selectedBranch"
-                :branches="branches"
-              ).q-mb-md
-
-          div(v-if="step == 2")
-            Loader(v-if="isLoading" :text='`Формируем документ...`')
-
-            div(v-else)
-              DocumentHtmlReader(:html="document.html")
-              q-btn(@click="back" flat size="sm") назад
-              q-btn(@click="sign" color="primary" size="sm") подписать
-
+q-dialog(v-model="isVisible" persistent :maximized="true")
+  ModalBase(:title="title" :show_close="false")
+    div.row.justify-center
+      div(style="padding-bottom: 100px;").col-md-8.col-col-xs-12
+
+        div(v-if="step === 1")
+          p.q-mt-lg
+            | Кооператив перешёл на двухэтапную систему управления на основании общего собрания уполномоченных председателей кооперативных участков...
+          Form(
+            :handler-submit="next"
+            :is-submitting="isSubmitting"
+            :showSubmit="!isLoading"
+            :showCancel="false"
+            :button-submit-txt="'Продолжить'"
+          ).q-pa-md
+            BranchSelector(
+              v-model:selectedBranch="selectedBranch"
+              :branches="branches"
+            ).q-mb-md
+
+        div(v-else-if="step === 2")
+          Loader(v-if="isLoading" :text="`Формируем документ...`")
+
+          div(v-else)
+            DocumentHtmlReader(:html="document.html")
+            q-btn(@click="back" flat size="sm") назад
+            q-btn(@click="sign" color="primary" size="sm") подписать
   </template>
 
-<script lang="ts" setup>
-  import { ModalBase } from 'src/shared/ui/ModalBase';
-  import { Form } from 'src/shared/ui/Form';
-  import { failAlert, SuccessAlert } from 'src/shared/api';
-  import { Loader } from 'src/shared/ui/Loader';
-  import { useSelectBranch } from '../model';
-  import { DocumentHtmlReader } from 'src/shared/ui/DocumentHtmlReader';
-  import { computed, ref } from 'vue';
-  import { DigitalDocument } from 'src/shared/lib/document';
-  import { useSystemStore } from 'src/entities/System/model';
-  import { useSessionStore } from 'src/entities/Session';
-  import { Cooperative } from 'cooptypes'
-  import { useBranchStore } from 'src/entities/Branch/model';
-  import { BranchSelector } from 'src/shared/ui/BranchSelector';
-  const {isVisible} = useSelectBranch()
-
-  const title = ref('Выберите кооперативный участок');
-  const step = ref(1)
-  const digitalDocument = new DigitalDocument()
-
-  const document = ref()
-  const isSubmitting = ref(false)
-  const isLoading = ref(false)
-  const system = useSystemStore()
-  const session = useSessionStore()
-  const branchStore = useBranchStore()
-  const selectedBranch = ref('')
-
-  // Массив используется без изменений
-  const branches = computed(() => branchStore.publicBranches)
-
-  const next = async() => {
-    generate()
-    step.value++
-  }
-
-  const back = () => step.value--
-  
-  if (session.isAuth)
-    branchStore.loadPublicBranches({ coopname: system.info.coopname })
-
-  const generate = async () => {
-    isLoading.value = true
-    document.value = await digitalDocument.generate<Cooperative.Registry.SelectBranchStatement.Action>({
-      registry_id: Cooperative.Registry.SelectBranchStatement.registry_id,
-      coopname: system.info.coopname,
-      username: session.username,
-      braname: selectedBranch.value
-    })
-
-    isLoading.value = false
-  }
-
-  const sign = async () => {
-
-    try {
-      isSubmitting.value = true
-      isSubmitting.value = false
-
-      const document = await digitalDocument.sign()
-      const {selectBranch} = useSelectBranch()
-
-      await selectBranch({
-        braname: selectedBranch.value,
-        coopname: system.info.coopname,
-        document,
-        username: session.username,
-      })
-      isVisible.value = false
-      SuccessAlert('Кооперативный участок выбран')
-    } catch(e: any){
-      isSubmitting.value = false
-      console.error(e)
-      failAlert(e)
-    }
-
-  }
-
-  const clear = () => {
-    console.log('clear')
-  }
-
-  </script>
+<script setup lang="ts">
+  import { ModalBase } from 'src/shared/ui/ModalBase'
+  import { Form } from 'src/shared/ui/Form'
+  import { Loader } from 'src/shared/ui/Loader'
+  import { BranchSelector } from 'src/shared/ui/BranchSelector'
+  import { DocumentHtmlReader } from 'src/shared/ui/DocumentHtmlReader'
+
+  import { useSelectBranch } from '../model'
+  import { useSelectBranchProcess } from 'src/processes/select-branch'
+
+  const { isVisible } = useSelectBranch()
+  const {
+    title,
+    step,
+    selectedBranch,
+    branches,
+    document,
+    isSubmitting,
+    isLoading,
+    next,
+    back,
+    sign
+  } = useSelectBranchProcess()
+
+</script>

package/src/features/Decision/CreateProject/ui/CreateProjectFreeDecisionButton.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 div
-  q-btn(@click="show = true" color="primary" size="sm" icon="add") предложить повестку
+  q-btn(@click="show = true" color="primary" icon="add") предложить повестку
   q-dialog(v-model="show" persistent :maximized="false" )
     ModalBase(style="width: 500px; max-width: 100% !important;" :title="'Предложить повестку'" :show_close="true")
       Form(:handler-submit="create" :is-submitting="isSubmitting" :showSubmit="!isLoading" :showCancel="true" :button-submit-txt="'Создать'" @cancel="clear" ).q-pa-md

package/src/features/Decision/ParticipantApplication/model/index.ts

@@ -0,0 +1,38 @@
+import { client } from 'src/shared/api/client'
+import { Mutations } from '@coopenomics/sdk'
+import { useSystemStore } from 'src/entities/System/model'
+
+export type IGenerateParticipantApplicationDecisionData = Mutations.Participants.GenerateParticipantApplicationDecision.IInput['data']
+export type IGenerateParticipantApplicationDecisionResult = Mutations.Participants.GenerateParticipantApplicationDecision.IOutput[typeof Mutations.Participants.GenerateParticipantApplicationDecision.name]
+
+export function useGenerateParticipantApplicationDecision() {
+  const { info } = useSystemStore()
+
+  /**
+   * Генерирует документ для решения по заявлению о вступлении в кооператив
+   */
+  async function generateParticipantApplicationDecision(
+    data: Omit<IGenerateParticipantApplicationDecisionData, 'coopname'>
+  ): Promise<IGenerateParticipantApplicationDecisionResult> {
+    const { [Mutations.Participants.GenerateParticipantApplicationDecision.name]: result } = await client.Mutation(
+      Mutations.Participants.GenerateParticipantApplicationDecision.mutation,
+      {
+        variables: {
+          data: {
+            coopname: info.coopname,
+            ...data
+          },
+          options: {
+            lang: 'ru'
+          }
+        }
+      }
+    )
+
+    return result
+  }
+
+  return {
+    generateParticipantApplicationDecision
+  }
+}

package/src/features/FreeDecision/CreateProject/model/index.ts

@@ -0,0 +1,92 @@
+import { client } from 'src/shared/api/client'
+import { Mutations } from '@coopenomics/sdk'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { ICreatedProjectDecisionData, IGeneratedProjectDecisionDocument } from 'src/entities/Decision/model'
+import { useSignDocument } from 'src/shared/lib/document'
+
+export type ICreateProjectDecisionData = Mutations.FreeDecisions.CreateProjectOfFreeDecision.IInput['data']
+
+export function useCreateProjectOfFreeDecision() {
+  const createProjectInput: Ref<ICreateProjectDecisionData> = ref({
+    decision: '',
+    question: ''
+  })
+
+  /**
+   * Создает проект свободного решения
+   */
+  async function createProject(coopname: string, username: string) {
+    const createdProject = await createProjectOfFreeDecision()
+
+    const generatedDocument = await generateProjectDocumentOfFreeDecision({
+      coopname: coopname,
+      project_id: createdProject.id,
+      username: username
+    })
+
+    const { signDocument } = useSignDocument()
+
+    const signedDocument = await signDocument(generatedDocument)
+
+    await publishProjectOfFreeDecision({
+      coopname: coopname,
+      document: signedDocument,
+      meta: '',
+      username: username
+    })
+  }
+
+  async function createProjectOfFreeDecision(): Promise<ICreatedProjectDecisionData> {
+    const { [Mutations.FreeDecisions.CreateProjectOfFreeDecision.name]: project } = await client.Mutation(
+      Mutations.FreeDecisions.CreateProjectOfFreeDecision.mutation,
+      {
+        variables: {
+          data: createProjectInput.value,
+        },
+      }
+    )
+
+    return project
+  }
+
+  /**
+   * Генерирует документ проекта свободного решения
+   */
+  async function generateProjectDocumentOfFreeDecision(data: Mutations.FreeDecisions.GenerateProjectOfFreeDecision.IInput['data']): Promise<IGeneratedProjectDecisionDocument> {
+    const { [Mutations.FreeDecisions.GenerateProjectOfFreeDecision.name]: document } = await client.Mutation(
+      Mutations.FreeDecisions.GenerateProjectOfFreeDecision.mutation,
+      {
+        variables: {
+          data,
+        },
+      }
+    )
+
+    return document
+  }
+
+  /**
+   * Публикует проект свободного решения
+   */
+  async function publishProjectOfFreeDecision(data: Mutations.FreeDecisions.PublishProjectOfFreeDecision.IInput['data']): Promise<Mutations.FreeDecisions.PublishProjectOfFreeDecision.IOutput[typeof Mutations.FreeDecisions.PublishProjectOfFreeDecision.name]> {
+    const { [Mutations.FreeDecisions.PublishProjectOfFreeDecision.name]: result } = await client.Mutation(
+      Mutations.FreeDecisions.PublishProjectOfFreeDecision.mutation,
+      {
+        variables: {
+          data,
+        },
+      }
+    )
+
+    return result
+  }
+
+  return {
+    createProjectInput,
+    createProject,
+    createProjectOfFreeDecision,
+    generateProjectDocumentOfFreeDecision,
+    publishProjectOfFreeDecision
+  }
+}

package/src/features/FreeDecision/CreateProject/ui/CreateProjectFreeDecisionButton.vue

@@ -0,0 +1,51 @@
+<template lang="pug">
+div
+  q-btn(@click="show = true" color="primary" size="sm" icon="add") предложить повестку
+  q-dialog(v-model="show" persistent :maximized="false" )
+    ModalBase(style="width: 500px; max-width: 100% !important;" :title="'Предложить повестку'" :show_close="true")
+      Form(:handler-submit="create" :is-submitting="isSubmitting" :showSubmit="!isLoading" :showCancel="true" :button-submit-txt="'Создать'" @cancel="clear" ).q-pa-md
+        div().q-mb-lg
+          q-input(dense v-model="createProjectInput.question" standout="bg-teal text-white" placeholder="" label="Вопрос на повестку дня" :rules="[val => notEmpty(val)]" autocomplete="off"  type="textarea")
+          q-input(dense v-model="createProjectInput.decision" standout="bg-teal text-white" placeholder="" label="Предлагаемое решение вопроса для голосования" :rules="[val => notEmpty(val)]" autocomplete="off"  type="textarea")
+
+
+</template>
+
+<script lang="ts" setup>
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+import { ref } from 'vue';
+import { useCreateProjectOfFreeDecision } from '../model';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { notEmpty } from 'src/shared/lib/utils';
+import { useSessionStore } from 'src/entities/Session';
+import { useSystemStore } from 'src/entities/System/model';
+
+const show = ref(false)
+const isSubmitting = ref(false)
+const isLoading = ref(false)
+const {createProjectInput, createProject} = useCreateProjectOfFreeDecision()
+const session = useSessionStore()
+const system = useSystemStore()
+
+const create = async () => {
+  try {
+    isSubmitting.value = true
+    await createProject(system.info.coopname, session.username)
+    isSubmitting.value = false
+    show.value = false
+    SuccessAlert('Вопрос добавлен на повестку для голосования')
+    createProjectInput.value.question = ''
+    createProjectInput.value.decision = ''
+  } catch(e){
+    isSubmitting.value = false
+    FailAlert(e)
+  }
+
+}
+
+const clear = () => {
+  show.value = false
+}
+
+</script>

package/src/features/FreeDecision/CreateProject/ui/index.ts

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

package/src/features/FreeDecision/GenerateDecision/index.ts

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

package/src/features/FreeDecision/GenerateDecision/model/index.ts

@@ -0,0 +1,36 @@
+import { client } from 'src/shared/api/client'
+import { Mutations } from '@coopenomics/sdk'
+import { useSystemStore } from 'src/entities/System/model'
+
+export type IGenerateFreeDecisionData = Mutations.FreeDecisions.GenerateFreeDecision.IInput['data']
+export type IGenerateFreeDecisionResult = Mutations.FreeDecisions.GenerateFreeDecision.IOutput[typeof Mutations.FreeDecisions.GenerateFreeDecision.name]
+
+export function useGenerateFreeDecision() {
+  const { info } = useSystemStore()
+
+  /**
+   * Генерирует документ для свободного решения
+   */
+  async function generateFreeDecision(data: Omit<IGenerateFreeDecisionData, 'coopname'>): Promise<IGenerateFreeDecisionResult> {
+    const { [Mutations.FreeDecisions.GenerateFreeDecision.name]: result } = await client.Mutation(
+      Mutations.FreeDecisions.GenerateFreeDecision.mutation,
+      {
+        variables: {
+          data: {
+            coopname: info.coopname,
+            ...data
+          },
+          options: {
+            lang: 'ru'
+          }
+        }
+      }
+    )
+
+    return result
+  }
+
+  return {
+    generateFreeDecision
+  }
+}

package/src/features/FreeDecision/index.ts

@@ -0,0 +1,2 @@
+export * from './CreateProject'
+export * from './GenerateDecision'

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

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

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

@@ -0,0 +1,92 @@
+import { client } from 'src/shared/api/client'
+import { useSignDocument } from 'src/shared/lib/document/model/entity'
+import { Mutations } from '@coopenomics/sdk'
+
+export type ISignBySecretaryResult = Mutations.Meet.SignBySecretaryOnAnnualGeneralMeet.IOutput[typeof Mutations.Meet.SignBySecretaryOnAnnualGeneralMeet.name]
+export type ISignByPresiderResult = Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.IOutput[typeof Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.name]
+
+interface ICloseMeetWithDecisionInput {
+  coopname: string
+  hash: string
+  username: string
+}
+
+
+export async function signBySecretaryOnAnnualGeneralMeetWithDecision(data: ICloseMeetWithDecisionInput): Promise<ISignBySecretaryResult> {
+  const { signDocument } = useSignDocument()
+  
+  const variables: Mutations.Meet.GenerateAnnualGeneralMeetDecisionDocument.IInput = {
+    data: {    
+      coopname: data.coopname,
+      username: data.username,
+    }
+  }
+  
+  // Генерируем документ решения
+  const { [Mutations.Meet.GenerateAnnualGeneralMeetDecisionDocument.name]: generatedDocument } = await client.Mutation(
+    Mutations.Meet.GenerateAnnualGeneralMeetDecisionDocument.mutation,
+    {
+      variables
+    }
+  )
+  
+  // Подписываем документ
+  const signedDocument = await signDocument(generatedDocument)
+
+  const variables2: Mutations.Meet.SignBySecretaryOnAnnualGeneralMeet.IInput = {
+    data: {
+      coopname: data.coopname,
+      hash: data.hash,
+      username: data.username,
+      secretary_decision: signedDocument
+    }
+  }
+  // Закрываем собрание с подписанным решением секретаря
+  const { [Mutations.Meet.SignBySecretaryOnAnnualGeneralMeet.name]: result } = await client.Mutation(
+    Mutations.Meet.SignBySecretaryOnAnnualGeneralMeet.mutation,
+    {
+      variables: variables2
+    }
+  )
+  
+  return result
+}
+
+export async function signByPresiderOnAnnualGeneralMeetWithDecision(data: ICloseMeetWithDecisionInput): Promise<ISignByPresiderResult> {
+  const { signDocument } = useSignDocument()
+  
+  const variables: Mutations.Meet.GenerateAnnualGeneralMeetDecisionDocument.IInput = {
+    data: {    
+      coopname: data.coopname,
+      username: data.username,
+    }
+  }
+  // Генерируем документ решения
+  const { [Mutations.Meet.GenerateAnnualGeneralMeetDecisionDocument.name]: generatedDocument } = await client.Mutation(
+    Mutations.Meet.GenerateAnnualGeneralMeetDecisionDocument.mutation,
+    {
+      variables
+    }
+  )
+  
+  // Подписываем документ
+  const signedDocument = await signDocument(generatedDocument)
+  
+  const variables2: Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.IInput = {
+    data: {
+      coopname: data.coopname,
+      hash: data.hash,
+      username: data.username,
+      presider_decision: signedDocument 
+    }
+  }
+  // Закрываем собрание с подписанным решением председателя
+  const { [Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.name]: result } = await client.Mutation(
+    Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.mutation,
+    {
+      variables: variables2
+    }
+  )
+  
+  return result
+}

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

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

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

@@ -0,0 +1,65 @@
+import { client } from 'src/shared/api/client'
+import { Mutations } from '@coopenomics/sdk'
+import { generateAgenda } from 'src/features/Meet/GenerateAgenda/model'
+import { useSignDocument } from 'src/shared/lib/document/model/entity'
+import { hashSHA256 } from 'src/shared/api/crypto'
+
+export type ICreateMeetInput = Mutations.Meet.CreateAnnualGeneralMeet.IInput['data']
+export type ICreateMeetResult = Mutations.Meet.CreateAnnualGeneralMeet.IOutput[typeof Mutations.Meet.CreateAnnualGeneralMeet.name]
+
+export interface ICreateMeetWithAgendaInput {
+  coopname: string
+  initiator: string
+  presider: string
+  secretary: string
+  open_at: string
+  close_at: string
+  username: string
+  agenda_points: {
+    title: string
+    context: string
+    decision: string
+  }[]
+}
+
+export async function createMeet(data: ICreateMeetInput): Promise<ICreateMeetResult> {
+  const { [Mutations.Meet.CreateAnnualGeneralMeet.name]: result } = await client.Mutation(
+    Mutations.Meet.CreateAnnualGeneralMeet.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+
+  return result;
+}
+
+export async function createMeetWithAgenda(data: ICreateMeetWithAgendaInput): Promise<ICreateMeetResult> {
+  const { signDocument } = useSignDocument()
+  // Генерируем документ повестки
+  const generatedDocument = await generateAgenda({
+    coopname: data.coopname,
+    username: data.username
+  })
+  // Подписываем документ
+  const signedDocument = await signDocument(generatedDocument)
+
+  // Создаем собрание
+  const result = await createMeet({
+    coopname: data.coopname,
+    agenda: data.agenda_points,
+    initiator: data.initiator,
+    presider: data.presider,
+    secretary: data.secretary,
+    open_at: data.open_at,
+    close_at: data.close_at,
+    hash: await hashSHA256(JSON.stringify({
+      coopname: data.coopname,
+      initiator: data.initiator,
+      timestamp: Date.now()
+    })),
+    proposal: signedDocument
+  })
+  return result
+}

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

@@ -0,0 +1,34 @@
+<template lang="pug">
+div
+  q-btn(
+    color="primary"
+    label="Создать общее собрание"
+    @click="showCreateMeetDialog = true"
+  )
+  CreateMeetForm(
+    v-model="showCreateMeetDialog"
+    :loading="isCreating"
+    @create="handleCreate"
+  )
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { CreateMeetForm } from './index'
+
+const showCreateMeetDialog = ref(false)
+const isCreating = ref(false)
+
+const emit = defineEmits<{
+  (e: 'create', formData: any): void
+}>()
+
+const handleCreate = async (formData: any) => {
+  isCreating.value = true
+  try {
+    emit('create', formData)
+  } finally {
+    isCreating.value = false
+  }
+}
+</script>