@ozdao/prometheus-framework 0.2.50 → 0.2.52

package/src/modules/organizations/components/blocks/CardDepartment.vue

@@ -1,77 +1,45 @@
 <template>
   <div class="radius-big o-hidden cols-2-1_3">
-    <!-- <Map :location="{lat: department.location.coordinates[1] ,lng: department.location.coordinates[0]}" class=""/> -->
 
     <div class="pd-medium w-100">
-     <svg  @click="$router.push(`/organizations/${props.organization}/departments/${department._id}/edit`)" class="i-regular pos-absolute pos-r-0 pos-t-0 t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z" fill="rgb(var(--black))"/>
-      </svg>
-      
+
+      <router-link 
+        :to="{
+          name: 'Department Edit', 
+          params: {
+            _id: props.organization,
+            department: department._id
+          }
+        }" 
+        class="
+          cursor-pointer 
+          pos-absolute pos-t-regular pos-r-regular
+          radius-extra pd-thin bg-second
+        "
+      >
+        <IconEdit
+          class="i-regular"
+          classes="fill-white"
+        />
+      </router-link>
+
       <h3 
         @click="$router.push(`/organizations/${props.organization}/departments/${department._id}`)"
         class="mn-b-small w-100"
         v-html="department.profile.name"
       />
     
-      <Spoiler 
-        class="
-          radius-small 
-          o-hidden
-          br-1px br-solid br-grey 
-          mn-b-thin
-        "
-        >
-        <template #header>
-          <div class="pd-small flex-v-center flex-nowrap flex">
-            <h5 class="w-100" >Contacts </h5>
-            <p class="mn-r-small">{{department.members.length}}&nbsp;человек</p>
-            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
-            </svg>
-
-          </div>
-        </template>
-        <template #content>
-           <ul>
-            <li v-if="department.members.length < 1">В отделе еще нет участников</li>
-            <User 
-              class="br-b br-solid br-grey" 
-              v-for="(member, index) in department.members" 
-              :key="index" 
-              :user="member.user" 
-              :position="member.position" 
-              @click="$router.push(`/app/profile/${member.user._id}`)" 
-            />
-          </ul>
-        </template>
-      </Spoiler>
-
-      <Spoiler 
-        class="
-          radius-small 
-          o-hidden
-          br-1px br-solid br-grey 
-          mn-b-thin
-        "
-        >
-        <template #header>
-          <div class="pd-small flex-v-center flex-nowrap flex">
-            <h5 class="w-100" >Working Hours </h5>
-            <p class="mn-r-small">{{department.subdepartments ? department.subdepartments.length : 0}}&nbsp;отделов</p>
-            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
-            </svg>
-
-          </div>
-        </template>
-        <template #content>
-          <ul>
-            <li v-if="department.subdepartments.length < 1">В отделе еще нет подотделов</li>
-            <DepartmentSub  v-for="(subdepartmentsartment, index) in department.subdepartments" @click="$router.push(`/organization/departments/${subdepartmentsartment._id}`)" :key="index" class="br-b br-solid br-grey" :department="subdepartmentsartment" />
-          </ul>
-        </template>
-      </Spoiler>
-
+      <ul>
+        <li v-if="department.members.length < 1">В отделе еще нет участников</li>
+        <User 
+          class="br-b br-solid br-grey" 
+          v-for="(member, index) in department.members" 
+          :key="index" 
+          :user="member.user" 
+          :position="member.position" 
+          @click="$router.push(`/app/profile/${member.user._id}`)" 
+        />
+      </ul>
     </div>
   </div>
 </template>
@@ -79,9 +47,9 @@
 <script setup>
 import { ref } from 'vue';
 
-import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
-import Map      from '@pf/src/components/Map/Map.vue';
+import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
+import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
 import User from '@pf/src/modules/organizations/components/blocks/User.vue';
 

package/src/modules/organizations/components/blocks/DepartmentMemberModify.vue

@@ -2,10 +2,43 @@
   <div>
 
     <div class="br-grey radius-small mn-small">
-      {{memberForm.id}}
+      <h3 class="mn-b-semi">Add to deparment</h3>
+
+      <div class="bg-grey mn-b-thin h-min-10r h-max-10r o-scroll pd-medium radius-big">
+        <Feed
+          :states="{
+            empty: {
+              title: 'No Members Found',
+              description: 'Currently, there are no members available.'
+            }
+          }"
+          :store="{
+            read: (options) => memberships.actions.read(options),
+            state: null
+          }"
+          :options="{
+            target: $route.params._id
+          }"
+          v-slot="{ 
+            items 
+          }"
+        >
+          <User 
+            v-for="(item, index) in items" 
+            :key="index" 
+            :photo="item.user.profile.photo"
+            :name="item.user.profile.name || item.user.phone || item.user.email || item.user._id"
+            :user="item" 
+            :position="item.position" 
+            @click="$router.push(`/app/profile/${user._id}`)" 
+            class="mn-b-thin" 
+          />
+        </Feed>
+      </div>
+
       <SelectMulti
         v-if="props.member === null"
-        v-model="memberForm.user"
+        v-model="userInput"
         :options="users"
         :multiple="false"
         :taggable="false"
@@ -13,11 +46,11 @@
         class="mn-b-semi bg-grey pd-medium radius-small" 
       />
 
-      <div v-else class="pd-small br-grey br-1px br-solid">
+    <!--   <div v-else class="pd-small br-grey br-1px br-solid">
         {{ memberForm.user.name ? memberForm.user.name : 'Безымянный' }}, {{memberForm.user.id}}
-      </div>
+      </div> -->
       <Field 
-        v-model:field="memberForm.position"  
+        v-model:field="roleInput"  
         label="Должность"  
         placeholder="Название должности" 
         class="bg-white "
@@ -25,7 +58,7 @@
       />
     </div>
 
-    <button :disabled="!memberForm.user._id || !memberForm.position" @click="submitForm" class="w-100 button bg-blue t-white">
+    <button :disabled="!userInput || !roleInput" @click="submitForm" class="w-100 button bg-blue t-white">
       {{ props.member !== null ? "Редактировать участника" : "Добавить участника" }}
     </button>
 
@@ -42,6 +75,11 @@ import SelectMulti    from '@pf/src/components/SelectMulti/SelectMulti.vue'
 import Field from "@pf/src/components/Field/Field.vue";
 import Select from "@pf/src/components/Select/Select.vue";
 
+import Feed from '@pf/src/components/Feed/Feed.vue'
+import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+
+import * as memberships   from '@pf/src/modules/organizations/store/memberships'
+
 const props = defineProps({
   isPopupOpen: Boolean,
   member: Number,
@@ -51,13 +89,11 @@ const props = defineProps({
 
 const emits = defineEmits(['callback','remove'])
 
-const memberForm = ref({
-  user: "",
-  position: "",
-});
+const userInput = ref(null);
+const roleInput = ref(null);
 
 if (props.member !== null) {
-  memberForm.value = props.members[props.member]
+  userInput.value = props.members[props.member]
 }
 
 import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
@@ -66,10 +102,11 @@ const placeValidation = ref(null)
 
 async function submitForm() {
    if (props.member !== null) {
-    props.members[props.member] = memberForm.value
+    props.members[props.member] = userInput
+    props.members[props.member].role = roleInput.value
     emits("callback");
   } else {
-    props.members.push(memberForm.value);
+    props.members.push({...userInput.value, role: roleInput.value});
     emits("callback");
   }
 }

package/src/modules/organizations/components/blocks/User.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="">
+  <div class="flex-v-center flex-nowrap flex">
     <img 
-      v-if="user.profile?.photo.length > 0 && type !== 'short'" 
-      :src="(FILE_SERVER_URL || '') + member.profile.photo" 
+      v-if="photo" 
+      :src="(FILE_SERVER_URL || '') + photo" 
       class="radius-medium object-fit-cover mn-r-thin i-thin" 
 
       @click.stop="$router.push({
@@ -12,22 +12,23 @@
         }
       })" 
     />
-
+    <!-- <pre>{{user}}</pre> -->
     <PlaceholderUserpic
-      v-if="!user.profile?.photo && type !== 'short'"
+      v-if="!photo"
       class="radius-medium mn-r-thin i-thin"
 
       @click.stop="$router.push({
-        name: user.type === 'user' ? 'User Profile' : 'Organization', 
+        name: 'User Profile', 
         params: {
           _id: user._id
         }
       })" 
     />
-    <!-- <div class="user-card__info"> -->
-      <!-- <p class="user-card__name">{{ user.profile?.name || 'Безымянный' }}</p> -->
+
+    <p>{{ name }}</p>
+      
    <!-- </div> -->
-      <div class="mn-r-auto">
+      <!-- <div class="mn-r-auto">
         <span class=" mn-r-small">{{user.profile?.email}} {{user.profile?.phone}}</span>
         <span class="t-transp">{{user.role}}</span>
         <br>
@@ -36,7 +37,7 @@
 
       <div v-if="user.position !== 'Основатель'" class="mn-l-medium flex-v-center flex">
         <button @click="removeMember(user)" class="button-small button">×</button>
-      </div>
+      </div> -->
  
   </div>
 </template>
@@ -50,6 +51,14 @@
     user: {
       type: Object,
       required: true
+    },
+    photo: {
+      type: String,
+      default: null
+    },
+    name: {
+      type: String,
+      default: 'Anonymous'
     }
     // Define other props here
   });

package/src/modules/organizations/components/pages/Department.vue

@@ -7,9 +7,25 @@
 
           <h2 class="w-100">{{ departments.state.department.profile.name }}</h2>
 
-          <svg @click="$router.push(`/organizations/${route.params._id}/departments/${route.params.department}/edit`)"  class="i-regular t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
-           <path d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z" fill="rgb(var(--black))"/>
-          </svg>
+          <router-link 
+            :to="{
+              name: 'Department Edit', 
+              params: {
+                _id: route.params._id,
+                department: route.params.department
+              }
+            }" 
+            class="
+              cursor-pointer 
+              pos-absolute pos-t-regular pos-r-regular
+              radius-extra pd-thin bg-second
+            "
+          >
+            <IconEdit
+              class="i-regular"
+              classes="fill-white"
+            />
+          </router-link>
 
         </div>
         <p class="t-transp p-big" v-html="departments.state.department.description"></p>

package/src/modules/organizations/components/pages/DepartmentEdit.vue

@@ -10,11 +10,15 @@
       </section>
 
     </header>
-
-    <div class="mn-b-thin bg-grey pd-medium o-hidden radius-big">
-      <h3 class="mn-b-semi">Profile</h3>
-      
-      <div v-if="departments.state.department.profile" class="radius-small flex-nowrap flex">
+    
+    <Block
+      title="Profile"
+      v-if="departments.state.department.profile"
+      class="mn-b-thin"
+    >
+      <div
+        class="cols-2-fit-content"
+      >
         <UploadImage 
            v-model:photo="departments.state.department.profile.photo"
           :uploadPath="'organizations/' + departments.state.department.name + '/avatars'"
@@ -37,7 +41,7 @@
           />  
         </div>
       </div>
-    </div>
+    </Block>
 
     <Block
       title="Team"
@@ -48,11 +52,14 @@
       }]"
       class="cols-1 gap-thin mn-b-thin"
     > 
+      <!-- {{departments.state.department.members[0]}} -->
       <User 
         class="bg-grey o-hidden radius-small mn-b-thin" 
         v-for="(member, index) in departments.state.department.members" 
         :key="index" 
         :user="member.user" 
+        :photo="member.user.profile.photo"
+        :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
         :position="member.position" 
         @click="openMemberPopup(index)"
       />
@@ -62,6 +69,7 @@
       title="Добавить участника" 
       @close-popup="closeMemberPopup" 
       :isPopupOpen="isOpenAddMemberPopup"
+      class="bg-white w-max-30r radius-big pd-big"
     >
       <DepartmentMemberModify 
         :members="departments.state.department.members" 
@@ -212,12 +220,8 @@ import User from '@pf/src/modules/organizations/components/blocks/User.vue';
 import * as departments from "@pf/src/modules/organizations/store/departments";
 import * as memberships from "@pf/src/modules/organizations/store/memberships";
 
-
-
 const router = useRouter();
 const route = useRoute();
-const tabOrganization = ref("details");
-const showAddNew = ref(false);
 
 async function fetchData() {
   if (route.params.department) {

package/src/modules/organizations/components/pages/Organization.vue

@@ -10,77 +10,43 @@
 			class="mn-b-semi"
 		/>
 
-		<!-- MEMBERS TAB -->
-		<Menu 
-			class="mn-b-regular bg-grey"
-		>
-		  <MenuItem 
-		  	@click="router.push({
-					name: 'Organization Members', 
-					params: {
-						_id: route.params._id
-					}
-				})" 
-		  	class="cursor-pointer"
-		  	theme="black"
-		  >
-		    <span>
-		    	{{organization.state.current.numberOfMembers}} members
-		    </span>
-		  </MenuItem> 
-		</Menu>
-
-		<div class="cols-2 pd-medium bg-grey radius-bg">
-
-			<Block
-		    title="Departments"
-				:actions="[{
-	        label: '+',
-	        function: () => $router.push(`/organizations/${route.params._id}/departments/create`)
-	      }]"
-		  >
-		  	<Feed
-		      :states="{
-		        empty: {
-		          title: 'No Departments Found',
-		          description: 'Currently, there are no departments available.'
-		        }
-		      }"
-		      :store="{
-		        read: (options) => departments.actions.read(route.params._id),
-		        state: null
-		      }"
-		      :options="{
-		          user: auth.state.user._id,
-		          sort: 'numberOfMemberships',
-		          limit: 10
-		      }"
-		      v-slot="{ 
-		        items 
-		      }"
-		    >
-		      <CardDepartment
-		        v-for="(department, index) in items"
-		        :key="index"
-		        :department="department"
-		        :organization="route.params._id"
-		        class="radius-big bg-white pos-relative mn-b-thin"
-		      />
-		     </Feed>
-			</Block>
-		   <div>
-		   	<User 
-		      v-for="(member, index) in organization.state.current.memberships" 
-		      :key="index" 
-		      :user="member" 
-		      :position="member.position" 
-		      @click="$router.push(`/app/profile/${member.user._id}`)" 
-		      class="bg-grey radius-small flex-nowrap flex  pd-medium"
-		    />
-
-	    </div>
-    </div>
-
+		<Block
+	    :title="`${organization.state.current.numberOfMembers} members`"
+			:actions="[{
+        label: '>',
+        function: () => $router.push(`/organizations/${route.params._id}/departments/create`)
+      }]"
+    	class="mn-b-semi"
+	  >
+	  	<Feed
+	      :states="{
+	        empty: {
+	          title: 'No Departments Found',
+	          description: 'Currently, there are no departments available.'
+	        }
+	      }"
+	      :store="{
+	        read: (options) => departments.actions.read(route.params._id),
+	        state: null
+	      }"
+	      :options="{
+	          user: auth.state.user._id,
+	          sort: 'numberOfMemberships',
+	          limit: 10
+	      }"
+	      v-slot="{ 
+	        items 
+	      }"
+	    >
+	      <CardDepartment
+	        v-for="(department, index) in items"
+	        :key="index"
+	        :department="department"
+	        :organization="route.params._id"
+	        class="radius-big bg-white pos-relative mn-b-thin"
+	      />
+	     </Feed>
+		</Block>	
 
 		<Tab 
 			v-model:selected="tabOrganization"
@@ -266,7 +232,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.replace({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: null});
 	});
 </script>
 

package/src/modules/organizations/components/sections/Feed.vue

@@ -129,7 +129,7 @@
 
   onMounted(async () => {
     isLoading.value = true;
-    console.log(props.selectedDate)
+    
     const data = await organizations.actions.read({
       skip: skip.value,
       limit: limit.value,

package/src/modules/organizations/controllers/memberships.controller.js

@@ -4,34 +4,37 @@ const controllerFactory = (db) => {
   const Membership = db.membership;
 
   const read = async (req, res) => {
-    let query = {};
-    let options = {};
-
-    if (req.query.user) {
-      query.user = req.query.user;
-    }
-
-    if (req.query.type) {
-      query.type = req.query.type;
-    }
-
-    if (req.query.target) {
-      query.target = req.query.target;
-    }
-
-    if (req.query.role) {
-      query.role = req.query.role;
-    }
-
     try {
-      const memberships = await Membership.find(query, null, options).populate('user');
-      if (!memberships) {
-        return res.status(404).send({ errorCode: "MEMBERSHIPS_NOT_FOUND" });
+      const memberships = await Membership.aggregate([
+        {
+          $match: {
+            ...(req.query.user && { user: new ObjectId(req.query.user) }),
+            ...(req.query.type && { type: req.query.type }),
+            ...(req.query.target && { target: new ObjectId(req.query.target) }),
+            ...(req.query.role && { role: req.query.role }),
+          },
+        },
+        {
+          $lookup: {
+            from: 'users',
+            localField: 'user',
+            foreignField: '_id',
+            as: 'user',
+          },
+        },
+        {
+          $unwind: '$user',
+        },
+      ]);
+
+      if (!memberships || memberships.length === 0) {
+        return res.status(404).send({ errorCode: 'MEMBERSHIPS_NOT_FOUND' });
       }
+
       res.send(memberships);
     } catch (err) {
-      console.log(err)
-      res.status(500).send({ errorCode: "SERVER_ERROR" });
+      console.log(err);
+      res.status(500).send({ errorCode: 'SERVER_ERROR' });
     }
   };
 

package/src/modules/organizations/controllers/organizations.controller.js

@@ -147,7 +147,6 @@ const controllerFactory = (db) => {
       });
     }
 
-
     if (location) {
 
       console.log(location)

package/src/modules/products/components/pages/EditLeftover.vue

@@ -112,7 +112,7 @@
 
   const totalPrice = computed(() => {
     return leftovers.state.current.positions.reduce((sum, position) => {
-      return sum + (position.price * (position.quantity || 1));
+      return sum + position.price;
     }, 0);
   });
 
@@ -147,14 +147,16 @@
   }
 
   function onSubmit() {
+    leftovers.state.current.organization = route.params._id;
+
     if (route.params.leftover) {
       leftovers.actions.update(leftovers.state.current).then(
-        () => router.push({ name: 'Backoffice Leftovers' }),
+        () => router.push({ name: 'Leftovers', params: {_id: route.params._id} }),
         (error) => console.error('error')
       );
     } else {
       leftovers.actions.create(leftovers.state.current).then(
-        () => router.push({ name: 'Backoffice Leftovers' }),
+        () => router.push({ name: 'Leftovers', params: {_id: route.params._id} }),
         (error) => console.error('error')
       );
     }
@@ -162,7 +164,7 @@
 
   function onDelete() {
     leftovers.actions.delete(route.params.leftover).then(
-      () => router.push({ name: 'Backoffice Leftovers' }),
+      () => router.push({ name: 'Leftovers', params: {_id: route.params._id} }),
       (error) => console.error('error')
     );
   }