@coopenomics/desktop 2.2.2

package/src/widgets/Cooperative/Members/ui/Members.vue

@@ -0,0 +1,220 @@
+<template lang="pug">
+div
+  div(v-if="members")
+    q-card(v-if="members.length > 0" flat)
+      q-table(
+        ref="tableRef" flat
+        bordered
+        :rows="members"
+        :columns="columns"
+        :table-colspan="9"
+        row-key="username"
+        :pagination="pagination"
+        virtual-scroll
+        :virtual-scroll-item-size="48"
+        :rows-per-page-options="[10]"
+      ).full-height
+
+        template(#top)
+          q-btn(icon="add" @click="showAdd = true" color="primary" size="sm") добавить участника
+
+
+        template(#header="props")
+          q-tr(:props="props")
+            q-th(
+              v-for="col in props.cols"
+              :key="col.name"
+              :props="props"
+            ) {{ col.label }}
+
+            q-th(auto-width)
+
+        template(#body="props")
+          q-tr(:key="`m_${props.row.username}`" :props="props")
+            q-td
+              q-badge(v-if="props.row.position === 'chairman'") Председатель совета
+              q-badge(v-if="props.row.position === 'member'") Член совета
+
+            q-td {{ props.row.username }}
+            q-td {{ props.row.last_name }}
+            q-td {{ props.row.first_name }}
+            q-td {{ props.row.middle_name }}
+
+            q-td {{ props.row.phone }}
+            q-td {{ props.row.email }}
+
+            q-td(auto-width)
+              q-btn(size="sm" color="red" dense  @click="removeMember(props.row.username)" :loading="showLoading") удалить
+
+
+  q-dialog(v-model="showAdd" persistent :maximized="false" )
+    q-card
+      div()
+        q-bar.bg-gradient-dark
+          span Добавить члена совета
+          q-space
+          q-btn(v-close-popup dense flat icon="close")
+            q-tooltip Close
+
+        div.q-pa-sm
+          div.q-pa-md
+            p Внимание! Вы собираетесь добавить участника в совет кооператива. Введите идентификатор аккаунта для добавления:
+            div.q-pa-md
+              q-input(v-model="persona.username" label="Идентификатор имени аккаунта" standout="bg-teal text-white")
+              //- q-input(v-model="persona.position_title" label="Позиция")
+          div
+            q-btn(flat @click="showAdd = false") Отменить
+            q-btn(color="primary" @click="addMember" :loading="showLoading") Добавить
+
+
+
+  </template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { Notify } from 'quasar';
+import { readBlockchain } from 'src/shared/api'
+import { useSessionStore } from 'src/entities/Session';
+import { useUpdateBoard } from 'src/features/Cooperative/UpdateBoard';
+import { COOPNAME } from 'src/shared/config';
+import { useCooperativeStore } from 'src/entities/Cooperative';
+import { sleep } from 'src/shared/api/sleep';
+
+const coop = useCooperativeStore()
+
+const showAdd = ref(false)
+
+const members = computed(() => coop.privateCooperativeData?.members || [])
+
+const persona = ref({
+  username: '',
+  position_title: 'Член совета',
+})
+
+const loadMembers = async () => {
+  coop.loadPrivateCooperativeData()
+}
+
+const showLoading = ref(false)
+
+loadMembers()
+
+const addMember = async () => {
+  const verified = await verify(persona.value.username)
+
+  if (!verified) {
+    Notify.create({
+      message: 'Имя аккаунта на найдено',
+      type: 'negative',
+    })
+
+    return
+  }
+
+  let members_for_send = members.value.map((el: { username: any; position_title: any; position: any; is_voting: any; }) => {
+    return {
+      username: el.username,
+      position_title: el.position_title,
+      position: el.position,
+      is_voting: el.is_voting
+    }
+  })
+
+  members_for_send.push({ username: persona.value.username, position_title: persona.value.position_title, position: 'member', is_voting: true });
+
+  showLoading.value = true
+
+  try {
+    await updateBoard(members_for_send)
+  } catch (e: any) {
+
+  }
+
+  showLoading.value = false
+  showAdd.value = false
+};
+
+const removeMember = async (username: string) => {
+  let members_for_send = members.value.map((el: { username: any; position_title: any; position: any; is_voting: any; }) => {
+    return {
+      username: el.username,
+      position_title: el.position_title,
+      position: el.position,
+      is_voting: el.is_voting
+    }
+  })
+
+  members_for_send = members_for_send.filter((el: { username: string; }) => el.username != username)
+  showLoading.value = true
+
+  try {
+    await updateBoard(members_for_send)
+  } catch (e: any) {
+
+  }
+  showLoading.value = false
+
+
+};
+
+const verify = async (username: string) => {
+
+  try {
+    await readBlockchain.v1.chain.get_account(username);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
+
+const updateBoard = async (new_members: any) => {
+  try {
+    const coop = useUpdateBoard()
+
+    await coop.updateBoard({
+      coopname: COOPNAME,
+      username: useSessionStore().username,
+      board_id: 0,
+      members: new_members,
+      name: 'Совет',
+      description: 'Совет кооператива'
+    })
+
+    await sleep(3000)
+
+    Notify.create({
+      message: 'Совет обновлен',
+      type: 'positive',
+    })
+
+    loadMembers()
+
+
+  } catch (e: any) {
+    loadMembers()
+    Notify.create({
+      message: e.message,
+      type: 'negative',
+    })
+  }
+}
+
+
+
+
+const columns = [
+  { name: 'position', align: 'left', label: 'Позиция', field: 'position', sortable: true },
+  { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
+  { name: 'last_name', align: 'left', label: 'Фамилия', field: 'last_name', sortable: true },
+  { name: 'first_name', align: 'left', label: 'Имя', field: 'first_name', sortable: true },
+  { name: 'middle_name', align: 'left', label: 'Отчество', field: 'middle_name', sortable: true },
+  // { name: 'middle_name', align: 'left', label: 'Отчество', field: 'middle_name', sortable: true },
+  { name: 'phone', align: 'left', label: 'Телефон', field: 'phone', sortable: false },
+  { name: 'email', align: 'left', label: 'Е-почта', field: 'email', sortable: false },
+] as any
+
+const tableRef = ref(null)
+const pagination = ref({ rowsPerPage: 10 })
+
+</script>

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

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

package/src/widgets/Cooperative/Orders/ListOfOrders/index.ts

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

package/src/widgets/Cooperative/Orders/ListOfOrders/ui/ListOfOrdersWidget.vue

@@ -0,0 +1,209 @@
+<template lang="pug">
+  div.row.justify-center
+    div.col-12
+      q-table(
+        v-if="orders && orders.results"
+        ref="tableRef"
+        class="my-sticky-dynamic"
+        flat
+        :rows="orders.results"
+        row-key="id"
+        :columns="columns"
+        :table-colspan="9"
+        :loading="onLoading"
+        :no-data-label="'ордера не найдены'"
+        virtual-scroll
+        @virtual-scroll="onScroll"
+        :virtual-scroll-item-size="48"
+        :virtual-scroll-sticky-size-start="48"
+        :rows-per-page-options="[0]"
+        :pagination="pagination"
+      )
+        template(#header="props")
+          q-tr(:props="props")
+            q-th(auto-width)
+            q-th(
+              v-for="col in props.cols"
+              :key="col.name"
+              :props="props"
+              @click="onSort(col)"
+            ) {{ col.label }}
+
+        template(#body="props")
+          q-tr(:key="`m_${props.row.order_num}`" :props="props")
+            q-td(auto-width)
+              q-btn(size="sm" color="primary" round dense :icon="expanded.get(props.row.order_num) ? 'remove' : 'add'" @click="toggleExpand(props.row.order_num)")
+            q-td {{props.row.order_num}}
+            q-td {{ props.row.quantity }}
+            q-td
+              q-badge(v-if="props.row.type ==='registration'") регистрационный
+              q-badge(v-if="props.row.type ==='deposit'") паевый
+
+            q-td {{getNameFromUserData(props.row.user?.private_data)}}
+
+            q-td
+              q-badge(v-if="props.row.status ==='completed'" color="teal") обработан
+              q-badge(v-if="props.row.status ==='pending'" color="orange") ожидание оплаты
+              q-badge(v-if="props.row.status ==='failed'" color="red") ошибка
+              q-badge(v-if="props.row.status ==='paid'" color="orange") оплачен
+              q-badge(v-if="props.row.status ==='refunded'" color="grey") отменён
+              q-badge(v-if="props.row.status ==='expired'" color="grey") истёк
+            q-td
+              q-btn-dropdown(size="sm" label="действия" color="primary" v-model="dropdowns[props.row.order_num]")
+                q-list(dense)
+                  SetOrderPaidStatusButton(:id="props.row.id" @close="closeDropdown(props.row.order_num)")
+                  SetOrderRefundedStatusButton(:id="props.row.id" @close="closeDropdown(props.row.order_num)")
+                  //- SetOrderCompletedStatusButton(:id="props.row.id" @close="closeDropdown(props.row.order_num)")
+
+          q-tr(v-if="expanded.get(props.row.order_num)" :key="`e_${props.row.order_num}`" :props="props" class="q-virtual-scroll--with-prev")
+            q-td(colspan="100%")
+              div(v-if="props.row.status=='failed'")
+                p Причина ошибки: {{props.row.message}}
+
+</template>
+<script setup lang="ts">
+  import { onMounted, ref, computed, reactive, nextTick } from 'vue'
+  import { Notify } from 'quasar'
+  import { getNameFromUserData } from 'src/shared/lib/utils/getNameFromUserData';
+  // import { formatToHumanDate } from 'src/shared/lib/utils/dates/formatToHumanDate';
+  import { useOrderStore } from 'src/entities/Order';
+  import { SetOrderPaidStatusButton } from 'src/features/Order/SetStatus/ui/SetOrderPaidStatusButton';
+  import { SetOrderRefundedStatusButton } from 'src/features/Order/SetStatus/ui/SetOrderRefundedStatusButton';
+  // import { SetOrderCompletedStatusButton } from 'src/features/Cooperative/Orders/SetStatus/ui/SetOrderCompletedStatusButton';
+
+  const orderStore = useOrderStore()
+  const orders = computed(() => orderStore.orders)
+  console.log('orders: ', orders.value)
+  const onLoading = ref(false)
+  const nextPage = ref(1)
+  const lastPage = ref(1);
+
+  const dropdowns = reactive({})
+
+  const sortState = reactive({
+    sortBy: '',
+    sortDir: ''
+  })
+
+  const sortedQuery = computed(() => {
+    if (sortState.sortBy && sortState.sortDir)
+      return `${sortState.sortBy}:${sortState.sortDir}`
+    else return ''
+  })
+
+  const onSort = (col) => {
+
+    if (!col.sortable) return
+
+  // Меняем направление сортировки, если кликнули на тот же столбец
+  if (sortState.sortBy === col.name) {
+    sortState.sortDir = sortState.sortDir === 'asc' ? 'desc' : 'asc'
+  } else {
+    // Если сортируем новый столбец, сбрасываем на 'asc'
+    sortState.sortBy = col.name
+    sortState.sortDir = 'asc'
+  }
+  orderStore.clear()
+  nextPage.value = 1
+  lastPage.value = 1
+  loadOrders(1) // Перезагружаем с новыми параметрами сортировки
+}
+
+  const closeDropdown = (id: string) => {
+    dropdowns[id] = false // Закрываем дропдаун для конкретной строки
+  }
+
+  const props = defineProps({
+    receiver: {
+      type: String,
+      required: false,
+      default: null
+    },
+  })
+
+  const loadOrders = async (page = 1) => {
+    try {
+      onLoading.value = true
+      await orderStore.loadCoopOrders({username: props.receiver, page, limit: 25, sortBy: sortedQuery.value})
+      lastPage.value = orderStore.orders?.totalPages || 1
+      onLoading.value = false
+    } catch (e: any) {
+      onLoading.value = false
+      console.log(e)
+      Notify.create({
+        message: e.message,
+        type: 'negative',
+      })
+    }
+  }
+
+  // Функция обработки виртуального скролла
+  const onScroll = ({ to, ref }) => {
+    if(orders.value) {
+
+      const lastIndex = orders.value.results.length - 1
+
+      if (onLoading.value !== true && nextPage.value < lastPage.value && to === lastIndex) {
+        onLoading.value = true
+
+        setTimeout(() => {
+          nextPage.value++
+          loadOrders(nextPage.value) // Загружаем следующую страницу
+
+          nextTick(() => {
+            ref.refresh() // Обновляем виртуальный скролл после загрузки
+            onLoading.value = false
+          })
+        }, 500) // Имитируем задержку загрузки
+      }
+    }
+  }
+
+  onMounted(() => {
+    orderStore.clear()
+    loadOrders()
+  })
+
+
+  const columns = [
+    { name: 'order_num', align: 'left', label: '№', field: 'order_num', sortable: true },
+    { name: 'quantity', align: 'left', label: 'Сумма', field: '', sortable: false },
+    { name: 'type', align: 'left', label: 'Тип платежа', field: 'type', sortable: true },
+    { name: 'name', align: 'left', label: 'От кого', field: '', sortable: false },
+    { name: 'status', align: 'left', label: 'Статус', field: '', 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: 0 })
+  </script>
+
+<style lang="sass">
+.my-sticky-dynamic
+  /* height or max-height is important */
+  height: 100vh
+
+  /* this will be the loading indicator */
+  thead tr:last-child th
+    /* height of all previous header rows */
+    top: 48px
+  thead tr:first-child th
+    top: 0
+
+  /* prevent scrolling behind sticky top row on focus */
+  tbody
+    /* height of all previous header rows */
+    scroll-margin-top: 48px
+
+</style>
+<style>
+.q-list--dense > .q-item, .q-item--dense {
+  padding: 0px !important;
+}
+</style>

package/src/widgets/Cooperative/Orders/ListOfOrders/ui/index.ts

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

package/src/widgets/Cooperative/Participants/ExitCard/index.ts

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

package/src/widgets/Cooperative/Participants/ExitCard/ui/ExitCard.vue

@@ -0,0 +1,15 @@
+<template lang="pug">
+q-card(flat bordered).q-pa-md
+  span.text-h6  Выход из Кооператива
+  div
+    span После рассмотрения Советом вашего заявления о выходе из Кооператива, вам будет возвращен минимальный паевый взнос, а Вы будете исключены из реестра пайщиков кооператива.
+  q-btn(color="red" @click="exit").q-mt-md
+    q-icon( color="white" name="send")
+    span.q-ml-sm Отправить заявление
+</template>
+<script lang="ts" setup>
+
+const exit = () => {
+  console.log('on exit')
+}
+</script>

package/src/widgets/Cooperative/Participants/ExitCard/ui/index.ts

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

package/src/widgets/Cooperative/Participants/ListOfParticipants/index.ts

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

package/src/widgets/Cooperative/Participants/ListOfParticipants/ui/ListOfParticipantsWidget.vue

@@ -0,0 +1,103 @@
+<template lang="pug">
+q-table(
+  ref="tableRef" v-model:expanded="expanded"
+  flat
+  :rows="participants.results"
+  :columns="columns"
+  :table-colspan="9"
+  row-key="username"
+  :pagination="pagination"
+  virtual-scroll
+  :virtual-scroll-item-size="48"
+  :rows-per-page-options="[10]"
+  :loading="onLoading"
+  :no-data-label="'У кооператива нет пайщиков'"
+).full-height
+  template(#top)
+    slot(name="top")
+
+  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.username}`" :props="props")
+      q-td(auto-width)
+        // q-toggle(v-model="props.expand" checked-icon="fas fa-chevron-circle-left" unchecked-icon="fas fa-chevron-circle-right" )
+        q-btn(size="sm" color="primary" round dense :icon="props.expand ? 'remove' : 'add'" @click="props.expand = !props.expand")
+      q-td {{ props.row.username }}
+      q-td {{ props.row.private_data?.last_name }}
+      q-td {{ props.row.private_data?.first_name }}
+      q-td {{ props.row.private_data?.middle_name }}
+      q-td {{ props.row.private_data?.phone }}
+      q-td {{ props.row.private_data?.email }}
+      q-td {{ moment(props.row.private_data?.birthdate).format('DD.MM.YY') }}
+      q-td {{ moment(props.row.private_data?._created_at).format('DD.MM.YY HH:mm:ss') }}
+
+
+    q-tr(v-show="props.expand" :key="`e_${props.row.username}`" :props="props" class="q-virtual-scroll--with-prev")
+      q-td(colspan="100%")
+        slot(:expand="props.expand" :receiver="props.row.username")
+
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { Notify } from 'quasar'
+
+import { sendGET } from 'src/shared/api';
+const participants = ref({ results: [] })
+const onLoading = ref(false)
+
+import moment from 'moment-with-locales-es6'
+
+const loadParticipants = async () => {
+  try {
+    onLoading.value = true
+
+    participants.value = await sendGET('/v1/users', {
+      limit: 100
+    })
+
+    onLoading.value = false
+  } catch (e: any) {
+    onLoading.value = false
+    Notify.create({
+      message: e.message,
+      type: 'negative',
+    })
+  }
+}
+
+loadParticipants()
+
+const columns = [
+  { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
+  { name: 'last_name', align: 'left', label: 'Фамилия', field: 'last_name', sortable: true },
+  { name: 'first_name', align: 'left', label: 'Имя', field: 'first_name', sortable: true },
+  { name: 'middle_name', align: 'left', label: 'Отчество', field: 'middle_name', sortable: true },
+
+  { name: 'phone', align: 'left', label: 'Телефон', field: 'phone', sortable: false },
+  { name: 'email', align: 'left', label: 'Е-почта', field: 'email', sortable: false },
+  { name: 'birthday', align: 'left', label: 'Дата рождения', field: 'birthday', sortable: true },
+  {
+    name: 'created_at',
+    align: 'left',
+    label: 'Зарегистрирован',
+    field: 'created_at',
+    sortable: true,
+  },
+] as any
+
+const expanded = ref([])
+const tableRef = ref(null)
+const pagination = ref({ rowsPerPage: 10 })
+
+</script>

package/src/widgets/Cooperative/Participants/ListOfParticipants/ui/index.ts

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

package/src/widgets/Desktop/LeftDrawerMenu/LeftDrawerMenu.vue

@@ -0,0 +1,10 @@
+<template lang="pug">
+div
+  //- WorkspaceMenu
+  SecondLevelMenuList
+
+</template>
+<script setup lang="ts">
+import { SecondLevelMenuList } from '../SecondLevelMenuList';
+
+</script>

package/src/widgets/Desktop/LeftDrawerMenu/index.ts

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

package/src/widgets/Desktop/SecondLevelMenu/SecondLevelMenu.vue

@@ -0,0 +1,57 @@
+<template lang="pug">
+q-tabs(
+  v-if="routes"
+  dense
+  switch-indicator
+  inline-label
+  outside-arrows
+  mobile-arrows
+  align="justify"
+  active-class="bg-teal"
+  active-bg-color="teal"
+  active-color="white"
+  indicator-color="secondary"
+).second-menu
+
+  q-route-tab(
+    v-for="route in routes"
+    :key="route.name"
+    :name="route.meta.title"
+    :label="route.meta.title"
+    :to="{ name: route.name }"
+    :params="{coopname: COOPNAME}"
+  )
+
+
+</template>
+<script lang="ts" setup>
+import { useCurrentUserStore } from 'src/entities/User';
+import { ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useDesktopStore } from 'src/entities/Desktop/model';
+import { type IRoute } from 'src/entities/Desktop/model/types';
+import { COOPNAME } from 'src/shared/config';
+const desktop = useDesktopStore()
+const routes = ref<IRoute[]>([])
+const route = useRoute()
+const user = useCurrentUserStore()
+
+const init = () => {
+  const userRole = user.userAccount?.role || 'user';
+
+  routes.value = (desktop.getSecondLevel(route) as unknown as IRoute[]).filter(
+    (route) => route.meta?.roles?.includes(userRole) || route.meta?.roles?.length === 0
+  );
+}
+
+init()
+
+watch(route, () => init())
+</script>
+
+<style>
+
+.second-menu .q-tab__label {
+  font-size: 12px !important;
+}
+</style>

package/src/widgets/Desktop/SecondLevelMenu/index.ts

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