Merge pull request #664 from OpenOlitor/fix/admin_percentage_cannot_b…

…e_less_than_0_and_more_than_90 Fix/admin percentage cannot be less than 0 and more than 90
OpenOlitor · Oct 4, 2023 · 616eb5c · 616eb5c
2 parents 82c390c + 281513b
commit 616eb5c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/scripts/abotypen/detail/abotypendetail.html b/app/scripts/abotypen/detail/abotypendetail.html
@@ -182,8 +182,8 @@ <h3 class="panel-title" translate>Zusatzdaten</h3>
                 <div class="input-group">
                   <div class="input-group-addon" ng-if="getModel() === 'abotypen'" >{{projekt.waehrung}}</div>
                   <div class="input-group-addon" ng-if="getModel() === 'zusatzAbotypen'" >{{projekt.waehrung}}</div>
-                  <input type="number" ng-if="getModel() === 'abotypen'" placeholder="{{'Preis'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" class="form-control" name="zielpreis" ng-model="abotyp.zielpreis"></input>
-                  <input type="number" ng-if="getModel() === 'zusatzAbotypen'" placeholder="{{'Preis'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" class="form-control" name="zielpreis" ng-model="zusatzAbotyp.zielpreis"></input>
+                  <input type="number" ng-if="getModel() === 'abotypen'" placeholder="{{'Preis'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" min="-99999.9" max="99999.99" class="form-control" name="zielpreis" ng-model="abotyp.zielpreis"></input>
+                  <input type="number" ng-if="getModel() === 'zusatzAbotypen'" placeholder="{{'Preis'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" min="-99999.9" max="99999.99" class="form-control" name="zielpreis" ng-model="zusatzAbotyp.zielpreis"></input>
                 </div>
               </div>
               <div class="col-md-5" style="line-height:30px">
@@ -198,8 +198,8 @@ <h3 class="panel-title" translate>Zusatzdaten</h3>
             <div class="col-md-6 row">
               <div class="col-md-7">
                 <div class="input-group">
-                  <input type="number" ng-if="getModel() === 'abotypen'" placeholder="{{'Satz'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" class="form-control" name="adminProzente" ng-model="abotyp.adminProzente" required></input>
-                  <input type="number" ng-if="getModel() === 'zusatzAbotypen'" placeholder="{{'Satz'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" class="form-control" name="adminProzente" ng-model="zusatzAbotyp.adminProzente" required></input>
+                  <input type="number" ng-if="getModel() === 'abotypen'" placeholder="{{'Satz'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" min="0" max="90" class="form-control" name="adminProzente" ng-model="abotyp.adminProzente" required></input>
+                  <input type="number" ng-if="getModel() === 'zusatzAbotypen'" placeholder="{{'Satz'|translate}}" ng-pattern="/^[0-9]+([\.,][0-9]{1,3})?$/" step="0.01" min="0" max="90" class="form-control" name="adminProzente" ng-model="zusatzAbotyp.adminProzente" required></input>
                   <div class="input-group-addon" translate>%</div>
                 </div>
               </div>

diff --git a/app/scripts/rechnungen/detail/rechnungendetail.html b/app/scripts/rechnungen/detail/rechnungendetail.html
@@ -141,7 +141,7 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Rechnungsdaten</spa
                 <div class="col-md-8">
                   <div class="input-group">
                     <div class="input-group-addon" ng-if="projekt !== undefined">{{projekt.waehrung}}</div>
-                    <input ng-disabled="!canEditBetrag()" type="number" placeholder="{{'Betrag'|translate}}" ng-pattern="/^[-+]?[0-9]+([\.,][0-9]{1,3})?$/" min="0" step="0.01" class="form-control" name="betrag" ng-model="rechnung.betrag" required></input>
+                    <input ng-disabled="!canEditBetrag()" type="number" placeholder="{{'Betrag'|translate}}" ng-pattern="/^[-+]?[0-9]+([\.,][0-9]{1,2})?$/" max="99999.99" min="0" step="0.01" class="form-control" name="betrag" ng-model="rechnung.betrag" required></input>
                   </div>
                 </div>
               </div>

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "openolitor-admin",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "private": false,
   "dependencies": {
     "jquery": "npm:jquery#3.6.0",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openolitor-admin",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "description": "OpenOlitor Client Webapplication - Admin-Portal",
   "repository": {
     "type": "git",