@coopenomics/desktop 2.2.2

package/src/widgets/Cooperative/Documents/ListOfDocuments/ui/ListOfDocumentsWidget.vue

@@ -0,0 +1,156 @@
+<template lang="pug">
+
+div.row.justify-center
+  div.col-12
+    q-table(
+      ref="tableRef"
+      flat
+      :rows="documents"
+      :columns="columns"
+      :table-colspan="9"
+      :pagination="pagination"
+      virtual-scroll
+      :virtual-scroll-item-size="48"
+      :rows-per-page-options="[10]"
+      :loading='onLoading'
+      :no-data-label="'документы не найдены'"
+    ).full-height
+      template(#top v-if="showFilter")
+        q-btn-toggle(
+          size="sm"
+          v-model="documentType"
+          spread
+          toggle-color="teal"
+          color="white"
+          text-color="black"
+          :options="[{label: 'Все входящие', value: 'newsubmitted'}, {label: 'Только утверждённые', value: 'newresolved'}]"
+        ).full-width
+
+      template(#header="props")
+
+        q-tr(:props="props")
+          q-th(auto-width)
+
+          q-th(
+            v-for="col in props.cols"
+            :key="col.name"
+            :props="props"
+          ) {{ col.label }}
+
+      template(#body="props")
+        q-tr(:key="`m_${props.row?.statement?.action?.global_sequence}`" :props="props")
+          q-td(auto-width)
+            q-btn(v-if="!expand" size="sm" color="primary" round dense :icon="expanded.get(props.row?.statement?.action?.global_sequence) ? 'remove' : 'add'" @click="toggleExpand(props.row?.statement?.action?.global_sequence)")
+
+          q-td {{ props.row.statement?.action?.data?.document.hash.substring(0, 10) }}
+
+          q-td {{ props.row.statement?.document?.full_title }}
+
+        q-tr(v-if="expanded.get(props.row?.statement?.action?.global_sequence) || expand" :key="`e_${props.row?.statement?.action?.global_sequence}`" :props="props" class="q-virtual-scroll--with-prev")
+          q-td(colspan="100%")
+            ComplexDocument(:documents="props.row")
+
+
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, computed, reactive, watch } from 'vue'
+import { Notify } from 'quasar'
+import { sendGET } from 'src/shared/api';
+import { ComplexDocument } from 'src/shared/ui/ComplexDocument';
+import type { IComplexDocument, IGetDocuments } from '@coopenomics/controller';
+
+const documents = ref<IComplexDocument[]>([])
+const onLoading = ref(false)
+
+const props = defineProps({
+  filter: {
+    type: Object,
+    required: true,
+    validator: (value: any) => {
+      // Проверка на наличие поля 'receiver' и типа string
+      return typeof value.receiver === 'string'
+    }
+  },
+  expand: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  showFilter: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
+  documentType: {
+    type: String,
+    required: false,
+  }
+})
+
+const receiver = computed(() => props.filter.receiver)
+const documentType = ref(props.documentType || 'newsubmitted')
+
+const loadDocuments = async () => {
+  try {
+    onLoading.value = true
+
+    const data: IGetDocuments = {
+      filter: {
+        receiver: receiver.value,
+        ...props.filter
+      },
+      type: documentType.value as 'newresolved' | 'newsubmitted'
+    }
+
+    documents.value = (await sendGET('/v1/documents/get-documents', {
+      ...data
+    })).results as IComplexDocument[]
+
+    onLoading.value = false
+  } catch (e: any) {
+    onLoading.value = false
+    console.log(e)
+    Notify.create({
+      message: e.message,
+      type: 'negative',
+    })
+  }
+}
+
+onMounted(() => {
+  loadDocuments()
+})
+
+watch(documentType, (newValue, oldValue) => {
+  if (newValue != oldValue) {
+    documents.value = []
+    loadDocuments()
+  }
+})
+
+// const getHumanActionName = (action) => {
+//   if (action == 'joincoop') {
+//     return 'Заявление на вступление'
+//   }
+// }
+
+const columns = [
+  { name: 'id', align: 'left', label: 'id', field: 'id', sortable: true },
+
+  { name: 'action', align: 'left', label: 'Документ', field: 'action', sortable: true },
+  // { name: 'timestamp', align: 'left', label: 'Дата', field: 'timestamp', sortable: true },
+  // { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
+] as any
+
+const expanded = reactive(new Map()) // Используем Map для отслеживания состояния развертывания каждой записи
+
+// Функция для переключения состояния развертывания
+const toggleExpand = (id: any) => {
+  expanded.set(id, !expanded.get(id))
+}
+
+
+const tableRef = ref(null)
+const pagination = ref({ rowsPerPage: 10 })
+</script>

package/src/widgets/Cooperative/Documents/ListOfDocuments/ui/index.ts

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

package/src/widgets/Cooperative/Funds/index.ts

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

package/src/widgets/Cooperative/Funds/ui/AccumulationFunds.vue

@@ -0,0 +1,121 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { FundContract } from 'cooptypes';
+import { useEditFund } from 'src/features/Fund/EditFund';
+import { COOPNAME } from 'src/shared/config';
+import { useSessionStore } from 'src/entities/Session';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useCooperativeStore } from 'src/entities/Cooperative';
+import AddAccumulationFund from './AddAccumulationFund.vue'
+import { useDeleteFund } from 'src/features/Fund/DeleteFund';
+
+const coop = useCooperativeStore()
+
+const loadFunds = async () => {
+  try {
+    await coop.loadFunds(COOPNAME)
+  } catch(e: any){
+    FailAlert(e.message)
+  }
+}
+
+loadFunds()
+
+const accumulationFunds = computed(() => coop.accumulationFunds)
+
+const showAdd = ref(false)
+
+const session = useSessionStore()
+
+const totalAccumulationPercent = computed(() =>
+  accumulationFunds.value.reduce((sum, item) => sum + Number(item.percent), 0)
+);
+
+const totalExpensePercent = computed(() => (100 - totalAccumulationPercent.value).toFixed(2))
+
+const delFund = async(fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFund) => {
+  const { deleteFund } = useDeleteFund()
+  try {
+    await deleteFund({
+      coopname: COOPNAME,
+      username: session.username,
+      type: 'accumulation',
+      fund_id: fund.id
+    })
+
+    await coop.loadFunds(COOPNAME)
+    SuccessAlert('Фонд успешно удалён')
+
+  } catch (e: any){
+    FailAlert(e.message)
+  }
+}
+
+const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFund) => {
+    const percent = Number(fund.percent) * 10000
+
+    const { editFund } = useEditFund()
+
+    try {
+
+      await editFund({
+        coopname: COOPNAME,
+        username: session.username,
+        type: 'accumulation',
+        fund_id: fund.id,
+        contract: '',
+        name: fund.name,
+        description: fund.description,
+        percent: percent
+      })
+
+      await coop.loadFunds(COOPNAME)
+
+      SuccessAlert('Фонд успешно обновлён')
+    } catch(e: any){
+      FailAlert(e.message)
+      await coop.loadFunds(COOPNAME)
+    }
+
+};
+
+const getLabel = (id: any) => {
+  if (id <= 3)
+    return 'обязательный'
+}
+
+const columns = ref([
+  { name: 'id', label: 'ID', field: 'id', align: 'left' },
+  { name: 'name', label: 'Название', field: 'name', align: 'left' },
+  // { name: 'description', label: 'Заметка', field: 'description', align: 'left' },
+  { name: 'percent', label: 'Процент', field: 'percent', align: 'left' }
+] as any)
+
+</script>
+
+<template lang="pug">
+div
+  q-table(v-if="accumulationFunds" flat :rows-per-page-options="[0]" :rows="accumulationFunds" :columns="columns" row-key="id")
+    template(#top)
+      div.full-width
+        p Все невозвратные членские взносы кооператива в первую очередь распределяются по фондам накопления в указанных соотношениях. Остаток после распределения заносится на накопительный счёт фондов списания. Первые три фонда являются обязательными.
+      div.q-mt-lg.full-width
+        q-btn(icon="add" @click="showAdd = true" color="primary" size="sm") добавить фонд
+    template(v-slot:body="props")
+      q-tr(:props="props" :key="props.row.id")
+        q-td(:props="props" key="id") {{ props.row.id }}
+        q-td(:props="props" key="name")
+          q-input(v-model="props.row.name" :label="getLabel(props.row.id)" :readonly="props.row.id <= 3" standout="bg-teal text-white" dense)
+        //- q-td(:props="props" key="description")
+        //-   q-input( placeholder="Место для заметки" v-model="props.row.description" standout="bg-teal text-white" dense)
+        q-td(:props="props" key="percent")
+          q-input( v-model="props.row.percent" type="number" standout="bg-teal text-white" dense)
+
+        q-td
+          q-btn(@click="saveFund(props.row)" label="Обновить" color="primary" dense size="sm").q-ma-xs
+          q-btn(@click="delFund(props.row)" :disabled="props.row.id <= 3" label="Удалить" color="primary" dense size="sm").q-ma-xs
+    template(#bottom)
+      p {{ totalAccumulationPercent }}% от каждого членского взноса распределяется среди фондов накопления, а {{ totalExpensePercent }}% направляется на накопительный кошелёк фондов списания.
+  AddAccumulationFund(:showAdd="showAdd" @close="showAdd = false")
+
+</template>

package/src/widgets/Cooperative/Funds/ui/AddAccumulationFund.vue

@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import { useCooperativeStore } from 'src/entities/Cooperative';
+import { useSessionStore } from 'src/entities/Session';
+import { useCreateFund } from 'src/features/Fund/CreateFund';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { COOPNAME } from 'src/shared/config';
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  showAdd: {
+    type: Boolean,
+    required: true,
+  }
+})
+
+const emit = defineEmits(['close'])
+const coop = useCooperativeStore()
+const { createFund } = useCreateFund()
+const session = useSessionStore()
+
+
+const localShowAdd = ref(false)
+const name = ref('')
+const description = ref('')
+const percent = ref()
+
+const addFund = async() => {
+  try{
+    await createFund({
+      coopname: COOPNAME,
+      username: session.username,
+      type: 'accumulation',
+      contract: '',
+      name: name.value,
+      description: description.value,
+      percent: Number(percent.value) * 10000
+    })
+
+    await coop.loadFunds(COOPNAME)
+    localShowAdd.value = false
+    name.value = ''
+    description.value = ''
+    percent.value = ''
+
+    SuccessAlert('Фонд успешно создан')
+  } catch(e: any){
+    localShowAdd.value = false
+    FailAlert(e.message)
+  }
+
+}
+
+watch(() => props.showAdd, (newValue: boolean) => {
+  localShowAdd.value = newValue
+})
+
+watch(localShowAdd, (newValue) => {
+  if (newValue === false)
+    emit('close')
+})
+</script>
+
+<template lang="pug">
+q-dialog(v-model="localShowAdd" persistent :maximized="false" )
+  q-card
+    div()
+      q-bar.bg-gradient-dark.text-white
+        span Добавить фонд накопления
+        q-space
+        q-btn(v-close-popup dense flat icon="close")
+          q-tooltip Close
+
+      div
+        q-input(standout="bg-teal text-white" label="Название фонда" v-model="name")
+        //- q-input(standout="bg-teal text-white" label="Заметка для фонда (не обязательно)" v-model="description")
+        q-input(standout="bg-teal text-white" label="Процент фонда" v-model="percent" type="number" min=0 step=1)
+      q-btn(flat @click="localShowAdd = false") отменить
+      q-btn(color="primary" @click="addFund") добавить
+</template>

package/src/widgets/Cooperative/Funds/ui/AddExpenseFund.vue

@@ -0,0 +1,76 @@
+<script setup lang="ts">
+import { useCooperativeStore } from 'src/entities/Cooperative';
+import { useSessionStore } from 'src/entities/Session';
+import { useCreateFund } from 'src/features/Fund/CreateFund';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { COOPNAME } from 'src/shared/config';
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  showAdd: {
+    type: Boolean,
+    required: true,
+  }
+})
+
+const emit = defineEmits(['close'])
+const coop = useCooperativeStore()
+const { createFund } = useCreateFund()
+const session = useSessionStore()
+
+
+const localShowAdd = ref(false)
+const name = ref('')
+const description = ref('')
+
+const addFund = async() => {
+  try{
+    await createFund({
+      coopname: COOPNAME,
+      username: session.username,
+      type: 'expend',
+      contract: '',
+      name: name.value,
+      description: description.value,
+      percent: 0
+    })
+
+    await coop.loadFunds(COOPNAME)
+    localShowAdd.value = false
+    name.value = ''
+    description.value = ''
+
+    SuccessAlert('Фонд успешно создан')
+  } catch(e: any){
+    localShowAdd.value = false
+    FailAlert(e.message)
+  }
+
+}
+
+watch(() => props.showAdd, (newValue: boolean) => {
+  localShowAdd.value = newValue
+})
+
+watch(localShowAdd, (newValue) => {
+  if (newValue === false)
+    emit('close')
+})
+</script>
+
+<template lang="pug">
+q-dialog(v-model="localShowAdd" persistent :maximized="false" )
+  q-card
+    div()
+      q-bar.bg-gradient-dark.text-white
+        span Добавить фонд списания
+        q-space
+        q-btn(v-close-popup dense flat icon="close")
+          q-tooltip Close
+
+      div
+        q-input(standout="bg-teal text-white" label="Название фонда" v-model="name")
+        //- q-input(standout="bg-teal text-white" label="Заметка для фонда (не обязательно)" v-model="description")
+      q-btn(flat @click="localShowAdd = false") отменить
+      q-btn(color="primary" @click="addFund") добавить
+</template>

package/src/widgets/Cooperative/Funds/ui/ChangeFunds.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import { default as AccumulationFunds} from './AccumulationFunds.vue'
+import { default as ExpenseFunds} from './ExpenseFunds.vue'
+</script>
+
+<template lang="pug">
+div
+  AccumulationFunds
+  ExpenseFunds
+
+</template>

package/src/widgets/Cooperative/Funds/ui/ExpenseFunds.vue

@@ -0,0 +1,113 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { FundContract } from 'cooptypes';
+import { useEditFund } from 'src/features/Fund/EditFund';
+import { COOPNAME } from 'src/shared/config';
+import { useSessionStore } from 'src/entities/Session';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useCooperativeStore } from 'src/entities/Cooperative';
+import AddExpenseFund from './AddExpenseFund.vue'
+import { useDeleteFund } from 'src/features/Fund/DeleteFund';
+
+const coop = useCooperativeStore()
+
+const loadFunds = async () => {
+  try {
+    await coop.loadFunds(COOPNAME)
+  } catch(e: any){
+    FailAlert(e.message)
+  }
+}
+
+loadFunds()
+
+const expenseFunds = computed(() => coop.expenseFunds)
+
+const showAdd = ref(false)
+
+const session = useSessionStore()
+
+const delFund = async(fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFund) => {
+  const { deleteFund } = useDeleteFund()
+  try {
+    await deleteFund({
+      coopname: COOPNAME,
+      username: session.username,
+      type: 'expend',
+      fund_id: fund.id
+    })
+
+    await coop.loadFunds(COOPNAME)
+    SuccessAlert('Фонд успешно удалён')
+
+  } catch (e: any){
+    FailAlert(e.message)
+  }
+}
+
+const saveFund = async (fund: FundContract.Tables.AccumulatedFunds.IAccumulatedFund) => {
+
+    const { editFund } = useEditFund()
+
+    try {
+
+      await editFund({
+        coopname: COOPNAME,
+        username: session.username,
+        type: 'expend',
+        fund_id: fund.id,
+        contract: '',
+        name: fund.name,
+        description: fund.description,
+        percent: 0
+      })
+
+      await coop.loadFunds(COOPNAME)
+
+      SuccessAlert('Фонд успешно обновлён')
+    } catch(e: any){
+      FailAlert(e.message)
+      await coop.loadFunds(COOPNAME)
+    }
+
+};
+
+const columns = ref([
+  { name: 'id', label: 'ID', field: 'id', align: 'left' },
+  { name: 'name', label: 'Название', field: 'name', align: 'left' },
+  // { name: 'description', label: 'Заметка', field: 'description', align: 'left' }
+] as any)
+
+const getLabel = (id: any) => {
+  if (id <= 5)
+    return 'обязательный'
+}
+
+</script>
+
+<template lang="pug">
+div
+  q-table(v-if="expenseFunds" flat :rows-per-page-options="[0]" :rows="expenseFunds" :columns="columns" row-key="id")
+    template(#top)
+      div.full-width
+        p Фонды списания используются для фиксации расходов кооператива с накопительного счёта невозвратных членских взносов кооператива, которые остались после распределения по фондам накопления. Первые два фонда являются обязательными.
+      div.q-mt-lg.full-width
+        q-btn(icon="add" @click="showAdd = true" color="primary" size="sm") добавить фонд
+
+    template(v-slot:body="props")
+      q-tr(:props="props" :key="props.row.id")
+
+        q-td(:props="props" key="id") {{ props.row.id }}
+        q-td(:props="props" key="name")
+          q-input(v-model="props.row.name" :label="getLabel(props.row.id)" :readonly="props.row.id <= 5" standout="bg-teal text-white" dense)
+
+        //- q-td(:props="props" key="description")
+        //-   q-input( placeholder="Место для заметки" v-model="props.row.description" standout="bg-teal text-white" dense)
+
+        q-td
+          q-btn(@click="saveFund(props.row)" label="Обновить" color="primary" size="sm" dense).q-ma-xs
+          q-btn(@click="delFund(props.row)"  label="Удалить" color="primary" size="sm" dense).q-ma-xs
+
+  AddExpenseFund(:showAdd="showAdd" @close="showAdd = false")
+
+</template>

package/src/widgets/Cooperative/Funds/ui/index.ts

@@ -0,0 +1,3 @@
+export {default as ChangeCooperativeFunds} from './ChangeFunds.vue'
+export {default as AccumulationFunds} from './AccumulationFunds.vue'
+export {default as ExpenseFunds} from './ExpenseFunds.vue'

package/src/widgets/Cooperative/Install/InstallWidgetBase/index.ts

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

package/src/widgets/Cooperative/Install/InstallWidgetBase/ui/InstallWidgetBase.vue

@@ -0,0 +1,29 @@
+<template lang="pug">
+div
+  q-card(flat bordered).q-pa-md.q-mb-lg
+    div(v-if="!installStore.is_finish")
+      p.text-h6.full-width.text-center Установка
+      div.q-mt-md
+        div(v-if="!isEntered")
+          span Для начала установки введите ключ аккаунта Кооператива, который был выдан Вам при регистрации:
+          RequestKeyForm.q-mt-md
+        div(v-else)
+          span Добавьте персональные данные председателя и членов совета для завершения установки.
+          SetSovietForm.q-mt-md
+    div(v-else)
+      p.text-h6.full-width.text-center Установка завершена
+      p Всем членам совета отправлены приглашения на электронные почты со ссылками для генерации цифровых подписей. Перейдите по своей ссылке из письма, получите ключ председателя, и используйте его для входа в свою систему. Эту страницу можно закрыть.
+      //- p.text-grey Ключ установки, который ранее вводился здесь, теперь используется только для входа в кабинет оператора, пайщиком которого вы стали при подключении к системе. В вашей же системе у вас новый ключ, который вы выпускаете себе сами.
+
+</template>
+<script setup lang="ts">
+import { useInstallCooperativeStore } from 'src/entities/Installer/model';
+import { RequestKeyForm } from 'src/features/Installer';
+import { SetSovietForm } from 'src/features/Installer';
+
+import { computed } from 'vue';
+
+const installStore = useInstallCooperativeStore()
+
+const isEntered = computed(() => installStore.wif)
+</script>

package/src/widgets/Cooperative/Install/InstallWidgetBase/ui/index.ts

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

package/src/widgets/Cooperative/Members/index.ts

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