all done

app.py

@@ -119,23 +119,32 @@ def alloborud():
 
 @app.route('/getall')
 def getall():
-    oborud = db.session.query(Auditory, Oboruds).filter(
-        Oboruds.aud_id==Auditory.id 
-        ).order_by(Oboruds.invNumber).all()
+    oborud = db.session.query(Oboruds).order_by(Oboruds.invNumber).all()
 
     results = []
-    for auditory, oboruds in oborud :
-        results.append({
-        'invNumber': oboruds.invNumber,
-        'nazvanie': oboruds.nazvanie,
-        'raspologenie': oboruds.raspologenie,
-        'balancenumber': oboruds.balancenumber,
-        'kolichestvo': oboruds.kolichestvo,
-        'numberppasu': oboruds.numberppasu,
-        'numberved': oboruds.numberved,
-        'aud': auditory.audnazvanie
-            
-    })
+    for oboruds in oborud :
+        if oboruds.aud_id is None:
+            results.append({
+            'invNumber': oboruds.invNumber,
+            'nazvanie': oboruds.nazvanie,
+            'raspologenie': oboruds.raspologenie,
+            'balancenumber': oboruds.balancenumber,
+            'kolichestvo': oboruds.kolichestvo,
+            'numberppasu': oboruds.numberppasu,
+            'numberved': oboruds.numberved,
+            'aud': ""   })
+        else:
+            aud = db.session.query(Auditory).filter_by(id=oboruds.aud_id).first()    
+            results.append({
+            'invNumber': oboruds.invNumber,
+            'nazvanie': oboruds.nazvanie,
+            'raspologenie': oboruds.raspologenie,
+            'balancenumber': oboruds.balancenumber,
+            'kolichestvo': oboruds.kolichestvo,
+            'numberppasu': oboruds.numberppasu,
+            'numberved': oboruds.numberved,
+            'aud': aud.audnazvanie   })
+ 
     
 
     return jsonify(results)
@@ -196,7 +205,7 @@ def addraspved():
         query_string = request.data.decode()
 
         un_query_string = unquote(unquote(query_string)).split(',')
-
+  
 
         ob = db.session.query(Oboruds).filter_by(invNumber=un_query_string[0]).first()
         
@@ -211,7 +220,32 @@ def addraspved():
 
 
         return jsonify({'success': True}, 200, {'ContentType': 'application/json'})
-         
+    
+
+@app.route('/addoborudasu', methods=['GET', 'POST'])
+def addoborud():
+    if request.method == 'POST':    
+
+        query_string = request.data.decode()
+
+        un_query_string = unquote(unquote(query_string)).split(',')
+        print(un_query_string)
+  
+        
+        db.session.add(
+                    Oboruds(invNumber=un_query_string[0], 
+                            nazvanie=un_query_string[5],
+                            raspologenie= un_query_string[4],
+                            numberved=un_query_string[1], 
+                            kolichestvo=un_query_string[2], 
+                            balancenumber=un_query_string[3]
+                            )
+                        )
+    
+        db.session.commit()
+
+
+        return jsonify({'success': True}, 200, {'ContentType': 'application/json'})
 
 # ==================================================================================