Skip to content

Commit 4b79bb0

Browse files
odeimaizodeimaiz
committed
vipStore -> vipMarket
1 parent 4c227fc commit 4b79bb0

File tree

7 files changed

+48
-49
lines changed

7 files changed

+48
-49
lines changed

‎services/static-webserver/client/source/class/osparc/navigation/UserMenu.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ qx.Class.define("osparc.navigation.UserMenu", {
103103
control.addListener("execute", () => osparc.cluster.Utils.popUpClustersDetails(), this);
104104
this.add(control);
105105
break;
106-
case "store":
107-
control = new qx.ui.menu.Button(this.tr("Store"));
108-
control.addListener("execute", () => osparc.vipStore.StoreWindow.openWindow());
106+
case "market":
107+
control = new qx.ui.menu.Button(this.tr("Market"));
108+
control.addListener("execute", () => osparc.vipMarket.MarketWindow.openWindow());
109109
this.add(control);
110110
break;
111111
case "about":
@@ -185,7 +185,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
185185
this.__addAnnouncements();
186186

187187
if (osparc.product.Utils.showS4LStore()) {
188-
this.getChildControl("store");
188+
this.getChildControl("market");
189189
}
190190

191191
this.getChildControl("about");
@@ -253,7 +253,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
253253
this.__addAnnouncements();
254254

255255
if (osparc.product.Utils.showS4LStore()) {
256-
this.getChildControl("store");
256+
this.getChildControl("market");
257257
}
258258

259259
this.getChildControl("about");

‎services/static-webserver/client/source/class/osparc/vipStore/AnatomicalModelDetails.js‎ renamed to ‎services/static-webserver/client/source/class/osparc/vipMarket/AnatomicalModelDetails.js‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.vipStore.AnatomicalModelDetails", {
18+
qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
1919
extend: qx.ui.core.Widget,
2020

2121
construct: function() {
@@ -114,6 +114,7 @@ qx.Class.define("osparc.vipStore.AnatomicalModelDetails", {
114114
"Height",
115115
"Date",
116116
"Ethnicity",
117+
"Functionality",
117118
].forEach(key => {
118119
if (key.toLowerCase() in features) {
119120
const titleLabel = new qx.ui.basic.Label().set({
@@ -140,29 +141,27 @@ qx.Class.define("osparc.vipStore.AnatomicalModelDetails", {
140141
}
141142
});
142143

143-
if (anatomicalModelsData["DOI"]) {
144-
const doiTitle = new qx.ui.basic.Label().set({
145-
value: "DOI",
146-
font: "text-14",
147-
alignX: "right",
148-
marginTop: 16,
149-
});
150-
moreInfoLayout.add(doiTitle, {
151-
column: 0,
152-
row: idx,
153-
});
154-
155-
const doiValue = new qx.ui.basic.Label().set({
156-
value: anatomicalModelsData["DOI"],
157-
font: "text-14",
158-
alignX: "left",
159-
marginTop: 16,
160-
});
161-
moreInfoLayout.add(doiValue, {
162-
column: 1,
163-
row: idx,
164-
});
165-
}
144+
const doiTitle = new qx.ui.basic.Label().set({
145+
value: "DOI",
146+
font: "text-14",
147+
alignX: "right",
148+
marginTop: 16,
149+
});
150+
moreInfoLayout.add(doiTitle, {
151+
column: 0,
152+
row: idx,
153+
});
154+
155+
const doiValue = new qx.ui.basic.Label().set({
156+
value: anatomicalModelsData["DOI"] ? anatomicalModelsData["DOI"] : "-",
157+
font: "text-14",
158+
alignX: "left",
159+
marginTop: 16,
160+
});
161+
moreInfoLayout.add(doiValue, {
162+
column: 1,
163+
row: idx,
164+
});
166165

167166
cardLayout.add(moreInfoLayout, {
168167
column: 1,

‎services/static-webserver/client/source/class/osparc/vipStore/AnatomicalModelListItem.js‎ renamed to ‎services/static-webserver/client/source/class/osparc/vipMarket/AnatomicalModelListItem.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.vipStore.AnatomicalModelListItem", {
18+
qx.Class.define("osparc.vipMarket.AnatomicalModelListItem", {
1919
extend: qx.ui.core.Widget,
2020
implement : [qx.ui.form.IModel, osparc.filter.IFilterable],
2121
include : [qx.ui.form.MModelProperty, osparc.filter.MFilterable],

‎services/static-webserver/client/source/class/osparc/vipStore/Store.js‎ renamed to ‎services/static-webserver/client/source/class/osparc/vipMarket/Market.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.vipStore.Store", {
18+
qx.Class.define("osparc.vipMarket.Market", {
1919
extend: osparc.ui.window.TabbedView,
2020

2121
construct: function() {
@@ -26,17 +26,17 @@ qx.Class.define("osparc.vipStore.Store", {
2626
});
2727
this.addWidgetOnTopOfTheTabs(miniWallet);
2828

29-
this.__vipStorePage = this.__getVIPStorePage();
29+
this.__vipMarketPage = this.__getVIPMarketPage();
3030
},
3131

3232
members: {
33-
__vipStorePage: null,
33+
__vipMarketPage: null,
3434

35-
__getVIPStorePage: function() {
35+
__getVIPMarketPage: function() {
3636
const title = this.tr("VIP Models");
3737
const iconSrc = "@FontAwesome5Solid/users/22";
38-
const vipStoreView = new osparc.vipStore.VIPStore();
39-
const page = this.addTab(title, iconSrc, vipStoreView);
38+
const vipMarketView = new osparc.vipMarket.VIPMarket();
39+
const page = this.addTab(title, iconSrc, vipMarketView);
4040
return page;
4141
},
4242
}

‎services/static-webserver/client/source/class/osparc/vipStore/StoreWindow.js‎ renamed to ‎services/static-webserver/client/source/class/osparc/vipMarket/MarketWindow.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.vipStore.StoreWindow", {
18+
qx.Class.define("osparc.vipMarket.MarketWindow", {
1919
extend: osparc.ui.window.TabbedWindow,
2020

2121
construct: function() {
22-
this.base(arguments, "store", this.tr("Store"));
22+
this.base(arguments, "store", this.tr("Market"));
2323

2424

2525
osparc.utils.Utils.setIdToWidget(this, "storeWindow");
@@ -31,24 +31,24 @@ qx.Class.define("osparc.vipStore.StoreWindow", {
3131
height
3232
})
3333

34-
const vipStore = this.__vipStore = new osparc.vipStore.Store();
35-
this._setTabbedView(vipStore);
34+
const vipMarket = this.__vipMarket = new osparc.vipMarket.Market();
35+
this._setTabbedView(vipMarket);
3636
},
3737

3838
statics: {
3939
openWindow: function() {
40-
const storeWindow = new osparc.vipStore.StoreWindow();
40+
const storeWindow = new osparc.vipMarket.MarketWindow();
4141
storeWindow.center();
4242
storeWindow.open();
4343
return storeWindow;
4444
}
4545
},
4646

4747
members: {
48-
__vipStore: null,
48+
__vipMarket: null,
4949

50-
openVIPStore: function() {
51-
return this.__vipStore.openVIPStore();
50+
openVIPMarket: function() {
51+
return this.__vipMarket.openVIPMarket();
5252
},
5353
}
5454
});

‎services/static-webserver/client/source/class/osparc/vipStore/SortModelsButtons.js‎ renamed to ‎services/static-webserver/client/source/class/osparc/vipMarket/SortModelsButtons.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.vipStore.SortModelsButtons", {
18+
qx.Class.define("osparc.vipMarket.SortModelsButtons", {
1919
extend: qx.ui.form.MenuButton,
2020

2121
construct: function() {

‎services/static-webserver/client/source/class/osparc/vipStore/VIPStore.js‎ renamed to ‎services/static-webserver/client/source/class/osparc/vipMarket/VIPMarket.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.vipStore.VIPStore", {
18+
qx.Class.define("osparc.vipMarket.VIPMarket", {
1919
extend: qx.ui.core.Widget,
2020

2121
construct: function() {
@@ -68,7 +68,7 @@ qx.Class.define("osparc.vipStore.VIPStore", {
6868
});
6969
this._add(toolbarLayout);
7070

71-
const sortModelsButtons = this.__sortByButton = new osparc.vipStore.SortModelsButtons().set({
71+
const sortModelsButtons = this.__sortByButton = new osparc.vipMarket.SortModelsButtons().set({
7272
alignY: "bottom",
7373
maxHeight: 27,
7474
});
@@ -98,7 +98,7 @@ qx.Class.define("osparc.vipStore.VIPStore", {
9898
const anatomicalModelsModel = this.__anatomicalModelsModel = new qx.data.Array();
9999
const membersCtrl = new qx.data.controller.List(anatomicalModelsModel, modelsUIList, "name");
100100
membersCtrl.setDelegate({
101-
createItem: () => new osparc.vipStore.AnatomicalModelListItem(),
101+
createItem: () => new osparc.vipMarket.AnatomicalModelListItem(),
102102
bindItem: (ctrl, item, id) => {
103103
ctrl.bindProperty("id", "modelId", null, item, id);
104104
ctrl.bindProperty("thumbnail", "thumbnail", null, item, id);
@@ -118,7 +118,7 @@ qx.Class.define("osparc.vipStore.VIPStore", {
118118
};
119119
this.__anatomicalModelsModel.append(qx.data.marshal.Json.createModel(loadingModel));
120120

121-
const anatomicModelDetails = new osparc.vipStore.AnatomicalModelDetails().set({
121+
const anatomicModelDetails = new osparc.vipMarket.AnatomicalModelDetails().set({
122122
padding: 20,
123123
});
124124
modelsLayout.add(anatomicModelDetails, {

0 commit comments

Comments
 (0)