minus_area in premise, calculation of areas and factors

api/methods.py

@@ -286,6 +286,7 @@ SELECT
   ,street
   ,zip
   ,city
+  ,minus_area
   ,account
   FROM premise_t
   ORDER BY
@@ -302,6 +303,7 @@ def insert_premise(user, token_info, **args):
     v_street = body["street"]
     v_zip = body["zip"]
     v_city = body["city"]
+    v_minus_area = body["minus_area"]
     v_account = body["account"]
     return dbInsert(user, token_info, {
       "statement": """
@@ -311,6 +313,7 @@ INSERT INTO premise_t
     ,street
     ,zip
     ,city
+    ,minus_area
     ,account
   ) VALUES (
     %s
@@ -318,6 +321,7 @@ INSERT INTO premise_t
     ,%s
     ,%s
     ,%s
+    ,%s
   )
   RETURNING *
 """,
@@ -326,6 +330,7 @@ INSERT INTO premise_t
     ,v_street
     ,v_zip
     ,v_city
+    ,v_minus_area
     ,v_account
       ]      
     })
@@ -343,6 +348,7 @@ SELECT
   ,street
   ,zip
   ,city
+  ,minus_area
   ,account
   FROM premise_t
   WHERE id = %s
@@ -358,6 +364,7 @@ def update_premise(user, token_info, premiseId=None, **args):
     v_street = body["street"]
     v_zip = body["zip"]
     v_city = body["city"]
+    v_minus_area = body["minus_area"]
     return dbUpdate(user, token_info, {
       "statement": """
 UPDATE premise_t
@@ -366,6 +373,7 @@ UPDATE premise_t
     ,street = %s
     ,zip = %s
     ,city = %s
+    ,minus_area = %s
   WHERE id = %s
   RETURNING *
 """,
@@ -374,6 +382,7 @@ UPDATE premise_t
     v_street,
     v_zip,
     v_city,
+    v_minus_area,
     premiseId
       ]      
     })
@@ -391,6 +400,7 @@ SELECT
   ,street
   ,zip
   ,city
+  ,minus_area
   ,account
   FROM premise_t
   WHERE account = %s
@@ -1305,6 +1315,7 @@ def get_account_entry_categorys(user, token_info):
 SELECT
   id
   ,description
+  ,considerMinusArea
   ,overhead_relevant
   FROM account_entry_category_t
   ORDER BY
@@ -1318,21 +1329,25 @@ def insert_account_entry_category(user, token_info, **args):
   try:
     body = args["body"]
     v_description = body["description"]
+    v_considerMinusArea = body["considerMinusArea"]
     v_overhead_relevant = body["overhead_relevant"]
     return dbInsert(user, token_info, {
       "statement": """
 INSERT INTO account_entry_category_t
   (
     description
+    ,considerMinusArea
     ,overhead_relevant
   ) VALUES (
     %s
     ,%s
+    ,%s
   )
   RETURNING *
 """,
       "params": [
     v_description
+    ,v_considerMinusArea
     ,v_overhead_relevant
       ]      
     })
@@ -1347,6 +1362,7 @@ def get_account_entry_category(user, token_info, account_entry_categoryId=None):
 SELECT 
   id
   ,description
+  ,considerMinusArea
   ,overhead_relevant
   FROM account_entry_category_t
   WHERE id = %s

api/openapi.yaml

@@ -1644,6 +1644,8 @@ components:
           type: string
         city:
           type: string
+        minus_area:
+          type: number
         account:
           type: integer
     flat:
@@ -1779,6 +1781,8 @@ components:
           type: integer
         description:
           type: string
+        considerMinusArea:
+          type: boolean
         overhead_relevant:
           type: boolean
     account_entry: