CHANGELOG.md

@@ -67,9 +67,12 @@
 - Clear browser cache when logging out to prevent cached data leaking into next logged in session !3024 @AntonBallmaier
 - Center Team member images properly !3037 @AntonBallmaier
 - Only load user details when logged in !1798 @alex.simm
+- Optimized width of store and dashboard !3053 @chriswalg
+- Fix saving regular pickups !3060 @AntonBallmaier
+- Fix for arbitration report overview !3062 @fs_k
 
 ## Refactoring
-- Refactor mailbox modul to vue and rest api !2580 !2870 !2871 !2918 !2934 !2971 !3002 @chriswalg @alex.simm
+- Refactor mailbox modul to vue and rest api !2580 !2870 !2871 !2918 !2934 !2971 !3002 !3058 @chriswalg @alex.simm
 - Use REST for quickreplying to wall posts !2795 @alex.simm
 - Cleaned up a lot of core code all over the place !2738 @\_fridtjof_
 - Preparations to routing/link building code for future porting to Symfony controllers !2738 @\_fridtjof_

client/src/components/Mailbox/MailboxNewAndAnswer.vue

@@ -63,6 +63,7 @@
                   :placeholder="$i18n('mailbox.tag_recipient_hint')"
                   class="form-control"
                   v-on="inputHandlers"
+                  @focusout="addTag()"
                 />
                 <b-input-group-append>
                   <b-button

client/src/components/Stores/RegularPickup.vue

@@ -26,8 +26,8 @@
     </b-row>
 
     <div
-      v-for="(item, key, index) in editPickupsCopied"
-      :key="key"
+      v-for="(item, index) in editPickups"
+      :key="index"
     >
       <br v-if="index !== 0">
       <b-row class="pb-1">
@@ -106,7 +106,7 @@
             variant="danger"
             :hidden="!editMode"
             size="sm"
-            @click="removePickup(key)"
+            @click="removePickup(index)"
           >
             <i class="fa fa-trash" />
           </b-button>
@@ -125,13 +125,12 @@
 </template>
 
 <script>
-import Vue from 'vue'
 import i18n, { locale } from '@/helper/i18n'
 
 export default {
   props: {
     loadedPickups: {
-      type: [Array, Object],
+      type: Array,
       default: () => [],
       required: true,
     },
@@ -140,7 +139,7 @@ export default {
   },
   data () {
     return {
-      editPickupsCopied: {},
+      editPickups: [],
       minCountPickupSlot: 1,
       weekdays: [
         { value: 1, text: this.$i18n('date.monday') },
@@ -170,42 +169,33 @@ export default {
   watch: {
     loadedPickups: {
       handler (newValue) {
-        this.editPickupsCopied = [...newValue]
+        this.editPickups = JSON.parse(JSON.stringify(newValue))
       },
       immediate: true,
     },
-    editPickupsCopied () {
-      this.$emit('update:editPickups', this.editPickupsCopied)
+    editPickups () {
+      this.$emit('update:editPickups', this.editPickups)
     },
   },
-  async created () {
-    this.editPickupsCopied = this.loadedPickups
-  },
   methods: {
     removePickup (key) {
-      Vue.delete(this.editPickupsCopied, key)
+      this.editPickups.splice(key, 1)
     },
     timeParser (value) {
       return value ? value + ':00' : ''
     },
     addNewItem () {
-      const selectedWeekdays = Object.values(this.editPickupsCopied).map(item => item.weekday)
+      const selectedWeekdays = Object.values(this.editPickups).map(item => item.weekday)
       const availableWeekdays = this.weekdays.filter(weekday => !selectedWeekdays.includes(weekday.value))
       const nextWeekday = availableWeekdays[0]?.value ?? 1
 
-      const newIndex = Object.keys(this.editPickupsCopied).length
       const newPickup = {
         weekday: nextWeekday,
         startTimeOfPickup: this.timeParser('10:30'),
         maxCountOfSlots: this.minCountPickupSlot,
       }
 
-      const updatedPickups = {
-        ...this.editPickupsCopied,
-        [`${newIndex}`]: newPickup,
-      }
-
-      this.editPickupsCopied = updatedPickups
+      this.editPickups.push(newPickup)
     },
   },
 }

client/src/components/Stores/StoreInformation.vue

@@ -423,6 +423,7 @@
       </b-tab>
     </b-tabs>
     <b-button
+      v-if="mayEditStore"
       variant="primary"
       @click="submit"
     >
@@ -465,13 +466,12 @@ export default {
     mayEditStore: { type: Boolean, default: null },
     isCoordinator: { type: Boolean, default: null },
     isVerified: { type: Boolean, default: null },
-    loadedPickups: { type: Array, default: () => { return [] } },
+    loadedPickups: { type: Array, default: () => [] },
   },
   data () {
     return {
       editMode: false,
-      editPickups: {},
-      previousEditPickups: null,
+      editPickups: [],
       selectedWeekDay: null,
       foodSearchCriteriaField: '',
       storeFoodNames: [],
@@ -552,8 +552,7 @@ export default {
     // Load data
     this.store = this.storeInformation
     this.editMode = (this.mayEditStore || this.isCoordinator)
-    this.editPickups = this.loadedPickups
-    this.previousEditPickups = this.simpleClone(this.loadedPickups)
+    this.editPickups = this.simpleClone(this.loadedPickups)
 
     if (this.store.categoryId === null) {
       this.store.categoryId = 0
@@ -577,11 +576,7 @@ export default {
     dispatchResize () {
       window.dispatchEvent(new Event('resize'))
     },
-    isUpdatedRegularPickup () {
-      return JSON.stringify(this.editPickups) !== JSON.stringify(this.previousEditPickups)
-    },
-    async submit (bvModalEvent) {
-      bvModalEvent.preventDefault()
+    async submit () {
       if (!this.publicInfoState) {
         pulseError(this.$i18n('storeview.invalid_field'))
         return
@@ -594,9 +589,10 @@ export default {
         delete store.region
         store.groceries = this.storeFoodIds
         await updateStore(store)
-        // TODO only send updates when neccessary
+        if (JSON.stringify(this.loadedPickups) !== JSON.stringify(this.editPickups)) {
           await editRegularPickup(this.storeId, this.editPickups)
-        await PickupsData.mutations.loadPickups(this.storeId)
+          await PickupsData.mutations.fetchRegularPickup(this.storeId)
+        }
         pulseSuccess(this.$i18n('storeedit.edit_success'))
         this.$bvModal.hide('storeInformationModal')
       } catch (err) {

client/src/views/pages/Dashboard/Dashboard.vue

 <template>
   <section
     v-if="user"
-    class="container my-3 my-sm-5"
+    class="container my-3 my-sm-5 p-0"
   >
     <div class="mb-1 mb-sm-3">
       <Broadcast

client/src/views/pages/Store/StorePage.vue

 <template>
   <section
     v-if="storeInformation"
-    class="container my-3 my-sm-5"
+    class="container my-3 my-sm-5 p-0"
   >
     <b-tabs
       content-class="mt-3"

src/Modules/Report/ReportGateway.php

@@ -251,8 +251,8 @@ class ReportGateway extends BaseGateway
             $query->andWhere($query->expr()->notIn('r.foodsaver_id', $excludeReportsWithUsers));
         }
         if (!empty($onlyReportsWithUsers)) {
-            $query->andWhere($query->expr()->notIn('r.reporter_id', $onlyReportsWithUsers));
-            $query->orWhere($query->expr()->notIn('r.foodsaver_id', $onlyReportsWithUsers));
+            $query->andWhere($query->expr()->In('r.reporter_id', $onlyReportsWithUsers));
+            $query->orWhere($query->expr()->In('r.foodsaver_id', $onlyReportsWithUsers));
         }
 
         // restrict access only to new reports to avoid social conflicts from old entries

templates/layouts/base.twig

@@ -74,7 +74,7 @@
                     {{ _main|raw }}
                 </main>
             {% else %}
-                <main id="main" class="container">
+                <main id="main" class="container p-0">
                     {% include 'partials/breadcrumbs.twig' with { items: bread } %}
                     {% if _top is not empty %}
                         <div class="pure-g">
@@ -119,7 +119,7 @@
                             {% endif %}
                             {% if _main is not empty %}
                                 <div class="pure-u-1 pure-u-md-{{ contentMainWidth(_left is not empty, _right is not empty, content.left.width, content.right.width, 24) }}-24">
-                                    <div class="inside">
+                                    <div class="inside p-0">
                                         {{ _main|raw }}
                                     </div>
                                 </div>