Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (33 commits) base app client changes Translation & UI updates FAMILY FILE family files localisation update family file change E-Refreal design blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). Updates & fixes all dialog changes and improvements (cont). UI fixes & updates family files changes Notification page fix Notifications UI fix feedback status added. Notifications UI redesigned Blood pressure chart fix My tracker fixes my family fixes ...merge-requests/437/head
@ -0,0 +1,6 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" viewBox="0 0 17 17">
|
||||
<g id="Group_8364" data-name="Group 8364" transform="translate(-238 -335)">
|
||||
<circle id="Ellipse_4" data-name="Ellipse 4" cx="8.5" cy="8.5" r="8.5" transform="translate(238 335)" fill="#349745"/>
|
||||
<text id="Check" transform="translate(242 347)" fill="#fff" font-size="9" font-family="FontAwesome5Free-Solid, 'Font Awesome \35 Free'" letter-spacing="-0.06em"><tspan x="0" y="0">✓</tspan></text>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 503 B |
@ -0,0 +1,6 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="14.068" height="14.94" viewBox="0 0 14.068 14.94">
|
||||
<g id="Group_8471" data-name="Group 8471" transform="translate(-325.503 -184.253)">
|
||||
<path id="Path_5005" data-name="Path 5005" d="M9.7,3.407h2.814a.7.7,0,0,0,0-1.407H9.7a.7.7,0,0,0,0,1.407Z" transform="translate(321.427 182.253)" fill="#5a282e"/>
|
||||
<path id="Path_5004" data-name="Path 5004" d="M15.365,5H2.7a.7.7,0,1,0,0,1.407H4.11v8.441a2.111,2.111,0,0,0,2.11,2.11h5.627a2.111,2.111,0,0,0,2.11-2.11V6.407h1.407a.7.7,0,1,0,0-1.407ZM8.331,12.738a.7.7,0,1,1-1.407,0V9.221a.7.7,0,1,1,1.407,0Zm2.814,0a.7.7,0,1,1-1.407,0V9.221a.7.7,0,1,1,1.407,0Z" transform="translate(323.503 182.235)" fill="#5a282e"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 721 B |
@ -0,0 +1,6 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" viewBox="0 0 17 17">
|
||||
<g id="Group_8365" data-name="Group 8365" transform="translate(-238 -335)">
|
||||
<circle id="Ellipse_4" data-name="Ellipse 4" cx="8.5" cy="8.5" r="8.5" transform="translate(238 335)" fill="#d02127"/>
|
||||
<path id="close_3_" data-name="close (3)" d="M4.449,3.9,7.377.967A.487.487,0,0,0,6.688.279L3.76,3.207.832.279A.487.487,0,0,0,.143.967L3.071,3.9.143,6.824a.487.487,0,1,0,.689.689L3.76,4.584,6.688,7.512a.487.487,0,0,0,.689-.689Zm0,0" transform="translate(242.74 339.604)" fill="#fff" stroke="#fff" stroke-width="0.75"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 621 B |
@ -0,0 +1,10 @@
|
||||
<svg id="switch" xmlns="http://www.w3.org/2000/svg" width="15.172" height="15.172" viewBox="0 0 15.172 15.172">
|
||||
<path id="Path_5147" data-name="Path 5147" d="M16.48,8.057a.474.474,0,0,1-.474-.474V4.738a.791.791,0,0,0-.79-.79H10.474a.474.474,0,1,1,0-.948h4.741a1.74,1.74,0,0,1,1.738,1.738V7.583A.474.474,0,0,1,16.48,8.057Z" transform="translate(-3.678 -1.104)" fill="#5a282e"/>
|
||||
<path id="Path_5148" data-name="Path 5148" d="M19.33,9.8A.47.47,0,0,1,19,9.665L17.889,8.559a.474.474,0,0,1,.335-.809h2.213a.474.474,0,0,1,.335.809L19.666,9.665A.47.47,0,0,1,19.33,9.8Z" transform="translate(-6.529 -2.851)" fill="#5a282e"/>
|
||||
<path id="Path_5149" data-name="Path 5149" d="M8.215,18.057H4.738A1.74,1.74,0,0,1,3,16.319V13.474a.474.474,0,1,1,.948,0v2.845a.791.791,0,0,0,.79.79H8.215a.474.474,0,1,1,0,.948Z" transform="translate(-1.104 -4.782)" fill="#5a282e"/>
|
||||
<path id="Path_5150" data-name="Path 5150" d="M3.937,15.055H1.724a.474.474,0,0,1-.335-.809L2.5,13.139a.474.474,0,0,1,.671,0l1.106,1.106a.474.474,0,0,1-.336.809Z" transform="translate(-0.46 -4.782)" fill="#5a282e"/>
|
||||
<circle id="Ellipse_186" data-name="Ellipse 186" cx="1.58" cy="1.58" r="1.58" transform="translate(1.58)" fill="#5a282e"/>
|
||||
<path id="Path_5151" data-name="Path 5151" d="M4.583,6H1.738A1.74,1.74,0,0,0,0,7.738v.316a.474.474,0,0,0,.474.474H5.847a.474.474,0,0,0,.474-.474V7.738A1.74,1.74,0,0,0,4.583,6Z" transform="translate(0 -2.207)" fill="#5a282e"/>
|
||||
<path id="Path_5152" data-name="Path 5152" d="M18.08,17.161a1.58,1.58,0,1,1,1.58-1.58A1.583,1.583,0,0,1,18.08,17.161Z" transform="translate(-6.069 -5.15)" fill="#5a282e"/>
|
||||
<path id="Path_5153" data-name="Path 5153" d="M19.847,22.529H14.474A.474.474,0,0,1,14,22.055v-.316A1.74,1.74,0,0,1,15.738,20h2.845a1.74,1.74,0,0,1,1.738,1.738v.316A.474.474,0,0,1,19.847,22.529Z" transform="translate(-5.15 -7.357)" fill="#5a282e"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 6.4 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
@ -1,44 +1,56 @@
|
||||
class GetCMCServicesResponseModel {
|
||||
String description;
|
||||
String descriptionN;
|
||||
int iD;
|
||||
bool isActive;
|
||||
int id;
|
||||
String serviceID;
|
||||
int orderServiceID;
|
||||
String text;
|
||||
String textN;
|
||||
dynamic price;
|
||||
int serviceID;
|
||||
dynamic totalPrice;
|
||||
dynamic vAT;
|
||||
dynamic priceVAT;
|
||||
dynamic priceTotal;
|
||||
bool isEnabled;
|
||||
int orderId;
|
||||
int quantity;
|
||||
|
||||
GetCMCServicesResponseModel(
|
||||
{this.description,
|
||||
this.descriptionN,
|
||||
this.iD,
|
||||
this.isActive,
|
||||
this.price,
|
||||
{this.id,
|
||||
this.serviceID,
|
||||
this.totalPrice,
|
||||
this.vAT});
|
||||
this.orderServiceID,
|
||||
this.text,
|
||||
this.textN,
|
||||
this.price,
|
||||
this.priceVAT,
|
||||
this.priceTotal,
|
||||
this.isEnabled,
|
||||
this.orderId,
|
||||
this.quantity});
|
||||
|
||||
GetCMCServicesResponseModel.fromJson(Map<String, dynamic> json) {
|
||||
description = json['Description'];
|
||||
descriptionN = json['DescriptionN'];
|
||||
iD = json['ID'];
|
||||
isActive = json['IsActive'];
|
||||
price = json['Price'];
|
||||
serviceID = json['ServiceID'];
|
||||
totalPrice = json['TotalPrice'];
|
||||
vAT = json['VAT'];
|
||||
id = json['id'];
|
||||
serviceID = json['serviceID'];
|
||||
orderServiceID = json['orderServiceID'];
|
||||
text = json['text'];
|
||||
textN = json['textN'];
|
||||
price = json['price'];
|
||||
priceVAT = json['priceVAT'];
|
||||
priceTotal = json['priceTotal'];
|
||||
isEnabled = json['isEnabled'];
|
||||
orderId = json['orderId'];
|
||||
quantity = json['quantity'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['Description'] = this.description;
|
||||
data['DescriptionN'] = this.descriptionN;
|
||||
data['ID'] = this.iD;
|
||||
data['IsActive'] = this.isActive;
|
||||
data['Price'] = this.price;
|
||||
data['ServiceID'] = this.serviceID;
|
||||
data['TotalPrice'] = this.totalPrice;
|
||||
data['VAT'] = this.vAT;
|
||||
data['id'] = this.id;
|
||||
data['serviceID'] = this.serviceID;
|
||||
data['orderServiceID'] = this.orderServiceID;
|
||||
data['text'] = this.text;
|
||||
data['textN'] = this.textN;
|
||||
data['price'] = this.price;
|
||||
data['priceVAT'] = this.priceVAT;
|
||||
data['priceTotal'] = this.priceTotal;
|
||||
data['isEnabled'] = this.isEnabled;
|
||||
data['orderId'] = this.orderId;
|
||||
data['quantity'] = this.quantity;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||