From f19781a68209f5ac0ef1c569c7febb2067c8cb57 Mon Sep 17 00:00:00 2001
From: Rupika <rupika.d97@gmail.com>
Date: Thu, 7 Feb 2019 18:13:32 -0800
Subject: [PATCH] added function that displays data values

---
 back/backend/policy.py |   1 +
 back/backend/views.py  |  28 +++++++++++++++++++++++++++-
 back/db.sqlite3        | Bin 97280 -> 99328 bytes
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/back/backend/policy.py b/back/backend/policy.py
index d40f56e..e325284 100644
--- a/back/backend/policy.py
+++ b/back/backend/policy.py
@@ -61,6 +61,7 @@ flight_section = Section(
         "departure_date": {"label": "Departure date", "type": "date"},
         "return_date": {"label": "Return date", "type": "date"},
         "fare": {"label": "Fare", "type": "decimal"},
+        "layovers": {"label": "Transit wait", "type": "integer"},
     }
 )
 
diff --git a/back/backend/views.py b/back/backend/views.py
index b04e358..3ef2682 100644
--- a/back/backend/views.py
+++ b/back/backend/views.py
@@ -49,13 +49,16 @@ def get_fields(s_id):
     # create dict of arrays for fields
     field_set = {"fields": []}
     queryset = Field.objects.filter(section_id=s_id).order_by('number')
+
     for i in queryset:
+        # function to print corresponding datatype
+        key, value = get_datatype(i)
         data = {
             "field_name": i.field_name,
             "label": i.label,
             "type": i.type,
             "number": i.number,
-            "value": "i.to_json()",
+            key: value
         }
         # append the fields to array
         # use copy() to avoid overwriting
@@ -63,6 +66,29 @@ def get_fields(s_id):
 
     return field_set
 
+# function to convert value into JSON
+def to_json(convert):
+    return {"value": convert}
+
+# function that gets corresponding
+# data type
+def get_datatype(self):
+    if self.type == "boolean":
+        if self.data_bool:
+            return "data_bool", True
+        else:
+            return "data_bool", False
+    elif self.type == "decimal":
+        return "decimal", self.data_decimal
+    elif self.type == "date":
+        return "date", "{}".format(self.data_date)
+    elif self.type == "file":
+        return "file", "{}".format(self.data_file)
+    elif self.type == "string":
+        return "string", "{}".format(self.data_string)
+    elif self.type == "integer":
+        return "integer", self.data_integer
+
 
 # API Endpoints
 @api_view(['POST'])
diff --git a/back/db.sqlite3 b/back/db.sqlite3
index fe3ce3eff3b1cdb31aac803e57d19c86f8d8abe2..9b7a3db3c49816018aeeb88b745028bf5b925f37 100644
GIT binary patch
delta 1215
zcmZvcUq~EB9LMK3ztuZE?>w!StC(mKXo-sE&KU3Z4q5_-#grO@wrMm~*Skq_sC(z$
zo_}JZ27CyGQp1)^p{Y${8YQ-1dZb684<YoS<ROGmXd|VRKBRe&Ktd5oO6lwv(>`=y
zKg-N-XMW$`%y)KXqhRJ-;art_kr1MZN4E2OLa=zff3?^bEic7d7|`N_Oi%O~ES)k;
zzjes<HcaQfaP`fiO0QXtxp#K_O*iNhx<((+-{>m+k=~&{&|CC7`VC#7*K$E;fOZ!k
zKy+GiO7e`&$Z5$*o9Zda3CVHEF`MC0$*iO)nUOSXhDH_?tDr=|hXkMEpZEwL=DZ)@
zM>~do>(M9MN+_<|h4tezT+ewgKEPtpJGNh-XYbdS6a_2roaMN()2g2<&IPX=!D@T5
zKPnlKR3*cbA?xa5uSn=6cnfDShTaA561toG4&vMAgndU2v~^k6mtL~c%N4oU^34^m
zf@`(_%@%-<aV=kQ41UH^G1NOH@Lo!wyFdS|4~i6Ylb^UF0o4^DF}l@M<{`C3Z3BE)
z24dWsfdbm8@yExZJ%29&O^8m|op+psr&vi_Ng?@*&?neM8(|%KMJJ5g>8ur0s_C{6
z59r_nf4*Z#1Qn6s%L~I0!LvS<Yr`;T-MpB9AYayD>0pIhgiFaA1Qy_3{2o8VE>!4!
zI!|@l3>#2RekUJ@aLbm=&G#O|LwwFEr<3e*yPe=`jiva^7(_}!Es3n5naPyisq^|V
zXy-f)ll1?}as|bQEHdaJA>hB5P{Ttb@CRSXKnD*d;4n`a(DUl1K1PI|ChEl7a1Sm(
zE4avA@)=>`aJtY#zde7z$D=0H(eNqW!Jvwt$U>=Cjh|%k!G@&Xmk^ouPVgEAFIUn8
zizkP*p{77kZ3r|q1VU;&l`++E{yu}cvgeahSyRqZ$M~ggXm+W#*!EEmc?<ZjN1<-F
zGLT9QF-`w>nQ&4!nW4+-wV_CszjhSr%fbnk)(kUiFu7i{$=kC~$pbx5S{^o-2yDvR
z+){qH2WlMQ<C?)DBYe()#*$EiWz6K}vb-h(Z_>^w=?h2H))YI#@1!B>if(Ou<7qyh
zhFV9&t|~SuqpwG{qRkl(d8O#Z$?fPeG(D3vcaCXEk;G&tnDL*AhO~*)C^Irw$3c-+
zDHLWC|AAF{nHJ+b^opB*5b$hmRN6`LKlj*2=x+&Ix99hx|Aig7u;W({vF?7_=knXf
e3V4Iyja=FG&#|O)%0mXFthQ-+0}7(H{C@y53_=?K

delta 940
zcmZuuO-NKx6u#%3`5))UY1F{-e;OUqW=xz$sg#~dNTXzinmRt6XZ|tscs`|#FqI28
zmG%}_NXpPmsD(9)iB=M>DhgUfi`vyrkU~UTbf2ghbT8-Q-t+sNa}raA#Fl<K+crT6
zi7@GA0yD)yn0V3i#gb9!a$pJc3Vp+3EE<tTDK0CSYLm4Uq~sH8WD<R-Q;pMCVJj&m
zrZ}}m=StHffVZBd;k<PVI#q8$Tqn4Vzi?f3&SoV&vumhlWwJPR{Xu3L;12tcPTWC~
zbk2Q8izo{tc}#V!?B%>phYnm)jf;6^8TW3|zu1O3&J5-<?sPMh97h-qIa~~*j&z3I
z>eAEhG(?`@8=OR*yT9OEM)lG1X{b%|&sJBQ9Bwi{(#6Vd;s*CH<?e*fNSiu9Z_)HI
z1|33bCjw?2+Q}_yj6#kppvCN+kZ30*X8NrIj?yI&>@+b79<D{88~qSYeTqUkq7go%
zj03QZ8d(!*CfqVtk5{-d*o1EKTXl|9rJ6_BC%HOj2fSGlpuz+!d)+n`;UEo!d&}MB
z+PNHDfuHaSrXUP1@}A6*1{}g%HK5C<cO-acs2aADAkg$N$fd_+_+j`Ty99T!mrCQn
zI|6<2QH4>m44bn}CPHK5&}iV}c2Z}itJfjusEm%uf-)G7h5PN~640;h;G-3zkaujq
zeSA&2*!v%0d~#{E0zOmlgjV5HEq$!8@dQP189kcjObu-o!RPk$4TycirGv3ZR8Yjw
zdB)zXvG*H2tgaY3N9SemHSW2^$CO>ainDf72pNoVzRhNW!povECdcx$6sSSDKM*SQ
zmzVm3Me?p`HwxE4IMjm6Su_|^L^-zGpD<EfO;_5X&|1_l$YQ99E!FgQsqUhvC<!tv
zBktuQ&s%9v8)VRrx8bC<Kx>K*9t_S_us=99n`}BGL6(89J1|?l`{ov&-jg6~^=j?%
S7xq0W4{yPIu!W@?p!);)f&EDU