Skip to content

Commit 9dcd855

Browse files
committed
[skip ci] show pricing units
1 parent ceecb69 commit 9dcd855

File tree

3 files changed

+51
-11
lines changed

3 files changed

+51
-11
lines changed

services/static-webserver/client/source/class/osparc/pricing/UnitsList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ qx.Class.define("osparc.pricing.UnitsList", {
8181

8282
pricingUnits.forEach(pricingUnit => {
8383
const pUnit = new osparc.study.PricingUnit(pricingUnit).set({
84-
showSpecificInfo: true,
84+
showAwsSpecificInfo: true,
8585
showEditButton: true,
8686
allowGrowY: false
8787
});

services/static-webserver/client/source/class/osparc/study/PricingUnit.js

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,18 @@ qx.Class.define("osparc.study.PricingUnit", {
4242
apply: "__buildLayout"
4343
},
4444

45-
showSpecificInfo: {
45+
showAwsSpecificInfo: {
4646
check: "Boolean",
4747
init: null,
4848
nullable: true,
49-
event: "changeShowSpecificInfo"
49+
event: "changeShowAwsSpecificInfo"
50+
},
51+
52+
showUnitExtraInfo: {
53+
check: "Boolean",
54+
init: true,
55+
nullable: true,
56+
event: "changeShowUnitExtraInfo"
5057
},
5158

5259
showEditButton: {
@@ -79,6 +86,13 @@ qx.Class.define("osparc.study.PricingUnit", {
7986
});
8087
this._add(control);
8188
break;
89+
case "unitExtraInfo":
90+
control = new qx.ui.basic.Label().set({
91+
font: "text-13",
92+
rich: true,
93+
});
94+
this._add(control);
95+
break;
8296
case "edit-button":
8397
control = new qx.ui.form.Button(qx.locale.Manager.tr("Edit"));
8498
this._add(control);
@@ -106,18 +120,21 @@ qx.Class.define("osparc.study.PricingUnit", {
106120
pricingUnit.bind("awsSpecificInfo", specificInfo, "value", {
107121
converter: v => qx.locale.Manager.tr("EC2") + ": " + v,
108122
});
109-
this.bind("showSpecificInfo", specificInfo, "visibility", {
123+
this.bind("showAwsSpecificInfo", specificInfo, "visibility", {
110124
converter: show => show ? "visible" : "excluded"
111125
})
112126
}
113127

114128
// add pricing unit extra info
129+
const unitExtraInfo = this.getChildControl("unitExtraInfo");
130+
let text = "";
115131
Object.entries(pricingUnit.getUnitExtraInfo()).forEach(([key, value]) => {
116-
this._add(new qx.ui.basic.Label().set({
117-
value: key + ": " + value,
118-
font: "text-13"
119-
}));
132+
text += `${key}: ${value}<br>`;
120133
});
134+
unitExtraInfo.setValue(text);
135+
this.bind("showUnitExtraInfo", unitExtraInfo, "visibility", {
136+
converter: show => show ? "visible" : "excluded"
137+
})
121138

122139
// add edit button
123140
const editButton = this.getChildControl("edit-button");

services/static-webserver/client/source/class/osparc/vipMarket/AnatomicalModelDetails.js

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,30 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
171171
},
172172

173173
__createPricingUnits: function(anatomicalModelsData) {
174-
const buttonsLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
174+
console.log(anatomicalModelsData);
175+
const pricingUnitsLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
176+
177+
const params = {
178+
url: {
179+
pricingPlanId: anatomicalModelsData["pricingPlanId"]
180+
}
181+
};
182+
osparc.data.Resources.fetch("pricingPlans", "getOne", params)
183+
.then(data => {
184+
const pricingUnits = data["pricingUnits"];
185+
pricingUnits.forEach(pricingUnit => {
186+
const pUnit = new osparc.study.PricingUnit(pricingUnit).set({
187+
showAwsSpecificInfo: false,
188+
showUnitExtraInfo: false,
189+
showEditButton: false,
190+
allowGrowY: false
191+
});
192+
pricingUnitsLayout.add(pUnit);
193+
});
194+
})
195+
.catch(err => console.error(err));
196+
197+
/*
175198
if (anatomicalModelsData["leased"]) {
176199
const leaseModelButton = new qx.ui.form.Button().set({
177200
label: this.tr("3 seats Leased (27 days left)"),
@@ -198,8 +221,8 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
198221
buttonsLayout.add(leaseModelButton, {
199222
flex: 1
200223
});
201-
202-
return buttonsLayout;
224+
*/
225+
return pricingUnitsLayout;
203226
},
204227
}
205228
});

0 commit comments

Comments
 (0)