Skip to content
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d8ca05c
CallTopicSelector
odeimaiz Sep 25, 2025
51eb6b5
BookACall stack
odeimaiz Sep 25, 2025
ce98393
__nextPressed
odeimaiz Sep 25, 2025
5bea90e
book a call stack
odeimaiz Sep 25, 2025
d4da958
minor
odeimaiz Sep 25, 2025
8ba352b
S4L_TOPICS
odeimaiz Sep 25, 2025
d1ce455
callTopicSelected
odeimaiz Sep 25, 2025
1ea33e5
currentStudy
odeimaiz Sep 25, 2025
1795b09
minor
odeimaiz Sep 25, 2025
9a53481
currentStudy -> tutorialsBtn
odeimaiz Sep 25, 2025
a276ef1
isBookACallEnabled
odeimaiz Sep 25, 2025
91bd9dc
unused
odeimaiz Sep 25, 2025
bbf825c
book-a-call-topic-selector
odeimaiz Sep 25, 2025
6379f79
rename
odeimaiz Sep 25, 2025
2dd2ffd
minor
odeimaiz Sep 25, 2025
0992125
minor
odeimaiz Sep 25, 2025
74d330f
addBookACallInfo
odeimaiz Sep 25, 2025
fe3b046
user friendly
odeimaiz Sep 25, 2025
c9fccac
Merge branch 'master' into enh/book-a-call-topic
odeimaiz Sep 26, 2025
41eb241
Merge branch 'enh/book-a-call-topic' of github.com:odeimaiz/osparc-si…
odeimaiz Sep 26, 2025
8d4b718
refactor
odeimaiz Sep 26, 2025
4e0ef2a
reset book a call
odeimaiz Sep 26, 2025
c02c945
minor
odeimaiz Sep 26, 2025
d3b505a
"listing"
odeimaiz Sep 26, 2025
4495c5f
minor
odeimaiz Sep 26, 2025
9353741
default cursor
odeimaiz Sep 26, 2025
df63f4e
minor
odeimaiz Sep 26, 2025
39229c0
aesthetics
odeimaiz Sep 26, 2025
a75041b
share project if needed
odeimaiz Sep 26, 2025
fbbb88b
improve logic
odeimaiz Sep 26, 2025
9d0f24e
improve logic
odeimaiz Sep 26, 2025
5b1f839
__updateCurrentStudyAccessRights
odeimaiz Sep 26, 2025
47c1210
minor
odeimaiz Sep 26, 2025
a92ff4b
Merge branch 'master' into enh/book-a-call-topic
odeimaiz Sep 26, 2025
b3bea5c
Merge branch 'master' into enh/book-a-call-topic
odeimaiz Sep 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -144,50 +144,8 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
case "s4lacad":
case "s4ldesktopacad": {
const application = new qx.ui.form.SelectBox();
[{
id: "other",
label: "Other"
}, {
id: "Antenna_Design_for_Wireless_Communication",
label: "Antenna Design for Wireless Communication"
}, {
id: "Bioelectronics,_Electroceuticals_and_Neuroprosthetics",
label: "Bioelectronics, Electroceuticals & Neuroprosthetics"
}, {
id: "Safety_and_Efficacy_Assessment",
label: "Safety & Efficacy Assessment"
}, {
id: "Exposure_and_Compliance",
label: "Exposure & Compliance"
}, {
id: "Focused_Ultrasound",
label: "Focused Ultrasound"
}, {
id: "In_Silico_Trials",
label: "In <i>Silico</i> Trials"
}, {
id: "Implant_Design",
label: "Implant Design"
}, {
id: "Magnetic_Resonance_Imaging",
label: "Magnetic Resonance Imaging"
}, {
id: "Neurostimulation",
label: "Neurostimulation"
}, {
id: "Personalized_Medicine",
label: "Personalized Medicine"
}, {
id: "Thermal_Therapies",
label: "Thermal Therapies"
}, {
id: "Wireless_Power_Transfer_Systems",
label: "Wireless Power Transfer Systems"
}, {
id: "Vascular_Flow_and_Perfusion",
label: "Vascular Flow & Perfusion"
}].forEach(appData => {
const lItem = new qx.ui.form.ListItem(appData.label, null, appData.id).set({
osparc.product.Utils.S4L_TOPICS.forEach(topic => {
const lItem = new qx.ui.form.ListItem(topic.label, null, topic.id).set({
rich: true
});
application.add(lItem);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {

__getMembersList: function() {
const membersUIList = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3,
appearance: "listing",
width: 150
});

Expand All @@ -157,6 +156,9 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
ctrl.bindProperty("showOptions", "showOptions", null, item, id);
},
configureItem: item => {
item.set({
cursor: "default",
});
item.subscribeToFilterGroup("organizationMembersList");
item.getChildControl("thumbnail").setDecorator("circled");
item.addListener("promoteToMember", e => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@ qx.Class.define("osparc.desktop.organizations.OrganizationDetails", {
"backToOrganizations": "qx.event.type.Event"
},

statics: {
createTabPage: function(label, icon) {
const tabPage = new qx.ui.tabview.Page().set({
layout: new qx.ui.layout.VBox(),
});
if (label) {
tabPage.setLabel(label);
}
if (icon) {
tabPage.setIcon(icon);
}
tabPage.getChildControl("button").set({
font: "text-13"
});
return tabPage;
},
},

members: {
__orgModel: null,
__titleLayout: null,
Expand Down Expand Up @@ -88,6 +106,10 @@ qx.Class.define("osparc.desktop.organizations.OrganizationDetails", {
this.__titleLayout.remove(this.__organizationListItem);
}
const organizationListItem = this.__organizationListItem = new osparc.ui.list.OrganizationListItem();
organizationListItem.set({
cursor: "default",
backgroundColor: null,
});
organizationListItem.getChildControl("options").exclude();
organizationListItem.setShowDeleteButton(false);
organizationListItem.addListener("openEditOrganization", () => this.__openEditOrganization());
Expand Down Expand Up @@ -126,28 +148,12 @@ qx.Class.define("osparc.desktop.organizations.OrganizationDetails", {
});
},

__createTabPage: function(label, icon) {
const tabPage = new qx.ui.tabview.Page().set({
layout: new qx.ui.layout.VBox()
});
if (label) {
tabPage.setLabel(label);
}
if (icon) {
tabPage.setIcon(icon);
}
tabPage.getChildControl("button").set({
font: "text-13"
});
return tabPage;
},

__getTabs: function() {
const tabView = new qx.ui.tabview.TabView().set({
contentPadding: 10
});

const membersListPage = this.__createTabPage(this.tr("Members"), "@FontAwesome5Solid/users/14");
const membersListPage = this.self().createTabPage(this.tr("Members"), "@FontAwesome5Solid/users/14");
const membersList = this.__membersList = new osparc.desktop.organizations.MembersList();
membersListPage.add(membersList, {
flex: 1
Expand All @@ -158,14 +164,14 @@ qx.Class.define("osparc.desktop.organizations.OrganizationDetails", {
plural: true,
firstUpperCase: true
});
const templatesListPage = this.__createTabPage(templatesText, "@FontAwesome5Solid/copy/14");
const templatesListPage = this.self().createTabPage(templatesText, "@FontAwesome5Solid/copy/14");
const templatesList = this.__templatesList = new osparc.desktop.organizations.TutorialsList();
templatesListPage.add(templatesList, {
flex: 1
});
tabView.add(templatesListPage);

const servicesListPage = this.__createTabPage(this.tr("Services"), "@FontAwesome5Solid/cogs/14");
const servicesListPage = this.self().createTabPage(this.tr("Services"), "@FontAwesome5Solid/cogs/14");
const servicesList = this.__servicesList = new osparc.desktop.organizations.ServicesList();
servicesListPage.add(servicesList, {
flex: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,9 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsList", {

__getOrganizationsList: function() {
const orgsUIList = this.__orgsUIList = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3,
appearance: "listing",
height: 150,
width: 150
width: 150,
});
osparc.utils.Utils.setIdToWidget(orgsUIList, "organizationsList");
orgsUIList.addListener("changeSelection", e => this.__organizationSelected(e.getData()), this);
Expand Down Expand Up @@ -170,6 +169,7 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsList", {
item.set({
minHeight: 1,
maxHeight: 1,
backgroundColor: "transparent",
decorator: "separator-strong",
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ qx.Class.define("osparc.desktop.organizations.ServicesList", {

__getServicesList: function() {
const servicesUIList = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3
appearance: "listing",
});

const servicesModel = this.__servicesModel = new qx.data.Array();
Expand All @@ -84,6 +83,9 @@ qx.Class.define("osparc.desktop.organizations.ServicesList", {
}, item, id);
},
configureItem: item => {
item.set({
cursor: "default",
});
item.subscribeToFilterGroup("organizationServicesList");
item.addListener("openMoreInfo", e => {
const serviceKey = e.getData()["key"];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ qx.Class.define("osparc.desktop.organizations.TutorialsList", {

__getTutorialsList: function() {
const templatesUIList = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3
appearance: "listing",
});

const templatesModel = this.__tutorialsModel = new qx.data.Array();
Expand All @@ -83,6 +82,9 @@ qx.Class.define("osparc.desktop.organizations.TutorialsList", {
}, item, id);
},
configureItem: item => {
item.set({
cursor: "default",
});
item.subscribeToFilterGroup("organizationTutorialsList");
item.addListener("openMoreInfo", e => {
const templateId = e.getData()["key"];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ qx.Class.define("osparc.desktop.paymentMethods.PaymentMethods", {
ctrl.bindProperty("expirationYear", "expirationYear", null, item, id);
},
configureItem: item => {
item.set({
cursor: "default",
});
item.addListener("openPaymentMethodDetails", e => this.__openPaymentMethodDetails(e.getData()));
item.addListener("deletePaymentMethod", e => this.__deletePaymentMethod(e.getData()));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {

__getMembersList: function() {
const membersUIList = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3,
appearance: "listing",
width: 150
});

Expand All @@ -145,6 +144,9 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
ctrl.bindProperty("showOptions", "showOptions", null, item, id);
},
configureItem: item => {
item.set({
cursor: "default",
});
item.subscribeToFilterGroup("walletMembersList");
item.getChildControl("thumbnail").setDecorator("circled");
item.addListener("promoteToAccountant", e => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ qx.Class.define("osparc.desktop.wallets.WalletListItem", {
layout.setColumnAlign(creditsCol, "right", "middle");

this.__buildLayout();

this.set({
backgroundColor: "transparent",
cursor: "default",
});
},

properties: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ qx.Class.define("osparc.desktop.wallets.WalletsList", {

__createWalletsList: function(widgetId) {
const walletsUIList = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3,
backgroundColor: "transparent",
appearance: "listing",
height: null,
focusable: false
});
Expand All @@ -118,7 +116,6 @@ qx.Class.define("osparc.desktop.wallets.WalletsList", {
},
configureItem: item => {
item.subscribeToFilterGroup("walletsList");

item.addListener("openEditWallet", e => this.__openEditWallet(e.getData()));
item.addListener("openShareWallet", e => this.__walletSelected(e.getData()));
item.addListener("buyCredits", e => this.fireDataEvent("buyCredits", e.getData()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ qx.Class.define("osparc.pricing.Plans", {
break;
case "pricing-plans-list":
control = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3
appearance: "listing",
});
control.addListener("changeSelection", e => {
const selection = e.getData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,5 +450,55 @@ qx.Class.define("osparc.product.Utils", {
groupServices: function() {
return Boolean(osparc.store.Products.getInstance().getGroupedServicesUiConfig());
},

isBookACallEnabled: function() {
return osparc.utils.Utils.isDevelopmentPlatform();
},

S4L_TOPICS: [
{
id: "other",
label: "Other"
}, {
id: "Antenna_Design_for_Wireless_Communication",
label: "Antenna Design for Wireless Communication"
}, {
id: "Bioelectronics,_Electroceuticals_and_Neuroprosthetics",
label: "Bioelectronics, Electroceuticals & Neuroprosthetics"
}, {
id: "Safety_and_Efficacy_Assessment",
label: "Safety & Efficacy Assessment"
}, {
id: "Exposure_and_Compliance",
label: "Exposure & Compliance"
}, {
id: "Focused_Ultrasound",
label: "Focused Ultrasound"
}, {
id: "In_Silico_Trials",
label: "In <i>Silico</i> Trials"
}, {
id: "Implant_Design",
label: "Implant Design"
}, {
id: "Magnetic_Resonance_Imaging",
label: "Magnetic Resonance Imaging"
}, {
id: "Neurostimulation",
label: "Neurostimulation"
}, {
id: "Personalized_Medicine",
label: "Personalized Medicine"
}, {
id: "Thermal_Therapies",
label: "Thermal Therapies"
}, {
id: "Wireless_Power_Transfer_Systems",
label: "Wireless Power Transfer Systems"
}, {
id: "Vascular_Flow_and_Perfusion",
label: "Vascular Flow & Perfusion"
}
],
}
});
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,9 @@ qx.Class.define("osparc.share.Collaborators", {
vBox.add(header);

const collaboratorsUIList = new qx.ui.form.List().set({
decorator: "no-border",
spacing: 3,
appearance: "listing",
width: 150,
padding: 0,
backgroundColor: "transparent",
});

const collaboratorsModel = this.__collaboratorsModel = new qx.data.Array();
Expand All @@ -356,6 +354,9 @@ qx.Class.define("osparc.share.Collaborators", {
}, item, id);
},
configureItem: item => {
item.set({
cursor: "default",
});
item.getChildControl("thumbnail").setDecorator("circled");
item.addListener("promoteToEditor", e => {
const orgMember = e.getData();
Expand Down Expand Up @@ -402,6 +403,7 @@ qx.Class.define("osparc.share.Collaborators", {
item.set({
minHeight: 1,
maxHeight: 1,
backgroundColor: "transparent",
decorator: "separator-strong",
});
}
Expand Down
Loading
Loading