Merge branch 'feature/meticulous-shot-history' into develop

graphefruit · Sep 3, 2024 · 0887a7a · 0887a7a
2 parents b6187ae + de977c0
commit 0887a7a
Show file tree

Hide file tree

Showing 103 changed files with 4,828 additions and 1,093 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.beanconqueror.app" version="7.4.0" xmlns="http://www.w3.org/ns/widgets">
+<widget id="com.beanconqueror.app" version="7.4.1" xmlns="http://www.w3.org/ns/widgets">
     <name>Beanconqueror</name>
     <description />
     <author email="[email protected]" href="https://github.com/graphefruit/beanconqueror">Lars Saalbach</author>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,6 +47,8 @@
     "@ionic/cordova-builders": "^8.0.0",
     "@ionic/storage": "^4.0.0",
     "@ionic/storage-angular": "^4.0.0",
+    "@meticulous-home/espresso-api": "^0.3.1",
+    "@meticulous-home/espresso-profile": "^0.4.0",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^4.0.0",
     "@zip.js/zip.js": "^2.7.14",
@@ -68,7 +70,6 @@
     "lodash": "^4.17.21",
     "long": "^5.2.0",
     "luxon": "^2.3.0",
-    "meticulous-api": "github:FFFuego/meticulous-typescript-api#dist",
     "moment": "^2.29.4",
     "ngx-stars": "^1.6.4",
     "postcss": "^8.3.5",
@@ -98,7 +99,7 @@
     "@wisdomgarden/cordova-plugin-filepath": "git+https://github.com/wisdom-garden/cordova-plugin-filepath.git",
     "cordova-android": "^13.0.0",
     "cordova-clipboard": "^1.3.0",
-    "cordova-ios": "^7.1.0",
+    "cordova-ios": "^7.1.1",
     "cordova-plugin-add-swift-support": "^2.0.2",
     "cordova-plugin-advanced-http": "^3.3.1",
     "cordova-plugin-android-permissions": "^1.1.5",
@@ -210,22 +211,22 @@
       "cordova-plugin-nativestorage": {},
       "cordova-plugin-androidx": {},
       "cordova-plugin-androidx-adapter": {},
-      "cordova-plugin-ble-central": {
-        "BLUETOOTH_USAGE_DESCRIPTION": "Bluetooth access needed to connect smartscales",
-        "IOS_INIT_ON_LOAD": "false",
-        "ACCESS_BACKGROUND_LOCATION": "false",
-        "BLUETOOTH_RESTORE_STATE": "false"
-      },
       "cordova-plugin-inappbrowser": {},
       "skwas-cordova-plugin-datetimepicker": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-file": {
         "ANDROIDX_WEBKIT_VERSION": "1.4.0"
+      },
+      "cordova-plugin-ble-central": {
+        "BLUETOOTH_USAGE_DESCRIPTION": "Bluetooth access needed to connect smartscales",
+        "IOS_INIT_ON_LOAD": "false",
+        "ACCESS_BACKGROUND_LOCATION": "false",
+        "BLUETOOTH_RESTORE_STATE": "false"
       }
     },
     "platforms": [
-      "ios",
-      "android"
+      "android",
+      "ios"
     ]
   },
   "platforms": [
@@ -240,4 +241,4 @@
     "*.css": "stylelint --fix",
     "*.{ts,js,css,md}": "prettier --write"
   }
-}
+}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -506,6 +506,8 @@ export class AppComponent implements AfterViewInit {
                   settingLanguage = 'fr';
                 } else if (systemLanguage === 'id') {
                   settingLanguage = 'id';
+                } else if (systemLanguage === 'nl') {
+                  settingLanguage = 'nl';
                 } else {
                   settingLanguage = 'en';
                 }

diff --git a/src/app/app.scss b/src/app/app.scss
@@ -739,6 +739,7 @@ ion-menu:host .menu-inner {
     font-weight: bold;
   }
 
+
   .button-top-absolute {
     position: absolute;
     top: -20px;
@@ -943,24 +944,27 @@ swiper-container {
   --swiper-scrollbar-drag-bg-color: rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.5);
 }
 
-swiper-slide {
-  display: flex;
-  position: relative;
+swiper-container.swiper {
+  swiper-slide {
+    display: flex;
+    position: relative;
 
-  flex-direction: column;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
+    flex-direction: column;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
 
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 
-  font-size: 18px;
+    font-size: 18px;
 
-  text-align: center;
-  box-sizing: border-box;
+    text-align: center;
+    box-sizing: border-box;
+  }
 }
 
+
 swiper-slide img {
   width: auto;
   max-width: 100%;

diff --git a/src/app/beans/bean-modal-select/bean-modal-select.component.html b/src/app/beans/bean-modal-select/bean-modal-select.component.html
@@ -101,6 +101,11 @@ <h6><ng-element *ngIf="bean.frozenId"><ion-icon style="top: 3px;position: relati
                       </p>
                     </div>
                   </ion-checkbox>
+                  <ion-thumbnail slot="end" *ngIf="bean.hasPhotos()">
+                    <div  style="margin: 0 auto;height: 100%;display: flex;align-items: center;" tappable>
+                      <async-image [filePath]="bean.attachments[0]" class="bean-slider"></async-image>
+                    </div>
+                  </ion-thumbnail>
                 </ion-item>
               </ng-element>
             </ag-virtual-scroll>
@@ -178,6 +183,11 @@ <h6><ion-icon style="top: 3px;position: relative;margin-right:5px;" name="snow-o
                       </p>
                     </div>
                   </ion-checkbox>
+                  <ion-thumbnail slot="end" *ngIf="bean.hasPhotos()">
+                    <div  style="margin: 0 auto;height: 100%;display: flex;align-items: center;" tappable>
+                      <async-image [filePath]="bean.attachments[0]" class="bean-slider"></async-image>
+                    </div>
+                  </ion-thumbnail>
                 </ion-item>
               </ng-element>
             </ag-virtual-scroll>
@@ -260,6 +270,11 @@ <h6><ng-element *ngIf="bean.frozenId">(<ion-icon style="top: 3px;position: relat
                       </p>
                     </div>
                   </ion-checkbox>
+                  <ion-thumbnail slot="end" *ngIf="bean.hasPhotos()">
+                    <div  style="margin: 0 auto;height: 100%;display: flex;align-items: center;" tappable>
+                      <async-image [filePath]="bean.attachments[0]" class="bean-slider"></async-image>
+                    </div>
+                  </ion-thumbnail>
                 </ion-item>
               </ng-element>
             </ag-virtual-scroll>
@@ -348,7 +363,11 @@ <h6><ng-element *ngIf="bean.frozenId">(<ion-icon style="top: 3px;position: relat
                         style='margin: 0;padding: 0;display: inline;'></span>
                       </p>
                     </ion-radio>
-
+                    <ion-thumbnail slot="end" *ngIf="bean.hasPhotos()">
+                      <div  style="margin: 0 auto;height: 100%;display: flex;align-items: center;" tappable>
+                        <async-image [filePath]="bean.attachments[0]" class="bean-slider"></async-image>
+                      </div>
+                    </ion-thumbnail>
                   </ion-item>
                 </ng-element>
               </ag-virtual-scroll>
@@ -430,6 +449,11 @@ <h6><ng-element *ngIf="bean.frozenId"><ion-icon style="top: 3px;position: relati
                         </p>
 
                     </ion-radio>
+                    <ion-thumbnail slot="end" *ngIf="bean.hasPhotos()">
+                      <div  style="margin: 0 auto;height: 100%;display: flex;align-items: center;" tappable>
+                        <async-image [filePath]="bean.attachments[0]" class="bean-slider"></async-image>
+                      </div>
+                    </ion-thumbnail>
                   </ion-item>
                 </ng-element>
               </ag-virtual-scroll>
@@ -511,7 +535,11 @@ <h6><ng-element *ngIf="bean.frozenId">(<ion-icon style="top: 3px;position: relat
                         style='margin: 0;padding: 0;display: inline;'></span>
                       </p>
                     </ion-radio>
-
+                    <ion-thumbnail slot="end" *ngIf="bean.hasPhotos()">
+                      <div  style="margin: 0 auto;height: 100%;display: flex;align-items: center;" tappable>
+                        <async-image [filePath]="bean.attachments[0]" class="bean-slider"></async-image>
+                      </div>
+                    </ion-thumbnail>
                   </ion-item>
                 </ng-element>
               </ag-virtual-scroll>

diff --git a/src/app/beans/bean-modal-select/bean-modal-select.component.ts b/src/app/beans/bean-modal-select/bean-modal-select.component.ts
@@ -409,7 +409,8 @@ export class BeanModalSelectComponent implements OnInit {
           e.name?.toLowerCase().includes(searchText) ||
           e.roaster?.toLowerCase().includes(searchText) ||
           e.aromatics?.toLowerCase().includes(searchText) ||
-          e.frozenId?.toLowerCase().includes(searchText)
+          e.frozenId?.toLowerCase().includes(searchText) ||
+          e.ean_article_number?.toLowerCase().includes(searchText)
       );
     }
     if (_type === 'open') {

diff --git a/src/app/beans/bean-popover-freeze/bean-popover-freeze.component.html b/src/app/beans/bean-popover-freeze/bean-popover-freeze.component.html
@@ -43,11 +43,11 @@
                  prevent-characters remove-empty-number spellcheck="false"
                  type="text" tabIndex="2">
       </ion-input>
-      <ion-button style='margin-left:0px;' [disabled]='freezePartialBagGrams<=0 || freezePartialBagGrams>leftOverBeanBagWeight' tabIndex="1" (click)='addOnePartialBag()'
+      <ion-button style='margin-left:0px;' [disabled]='isAddingBagDisabled()' tabIndex="1" (click)='addOnePartialBag()'
                   class="big-icon-only" fill="clear" slot="end" tappable>
         <ion-icon  name="beanconqueror-add-single-entry" slot='icon-only'></ion-icon>
       </ion-button>
-      <ion-button  style='margin-left:0px;' [disabled]='freezePartialBagGrams<=0 || freezePartialBagGrams>leftOverBeanBagWeight' tabIndex="3" (click)='addMaxPartialBags()'
+      <ion-button  style='margin-left:0px;' [disabled]='isAddingBagDisabled()' tabIndex="3" (click)='addMaxPartialBags()'
                   class="big-icon-only"  fill="clear" slot="end" tappable>
         <ion-icon  name="beanconqueror-add-list" slot='icon-only'></ion-icon>
       </ion-button>