Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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 @@ -29,7 +29,7 @@ qx.Class.define("osparc.data.model.Wallet", {
thumbnail: walletData["thumbnail"] ? walletData["thumbnail"] : null,
owner: walletData["owner"] ? walletData["owner"] : null,
status: walletData["status"] ? walletData["status"] : "INACTIVE",
creditsAvailable: walletData["availableCredits"] ? walletData["availableCredits"] : 0,
creditsAvailable: walletData["availableCredits"] ? parseFloat(walletData["availableCredits"]) : 0,
accessRights: walletData["accessRights"] ? walletData["accessRights"] : [],
autoRecharge: walletData["autoRecharge"] ? walletData["autoRecharge"] : null,
preferredWallet: osparc.Preferences.getInstance().getPreferredWalletId() === walletData["walletId"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ qx.Class.define("osparc.desktop.credits.BuyCreditsStepper", {
this.removeAll();
this.__form = new osparc.desktop.credits.BuyCreditsForm(this.__paymentMethods);
this.__form.addListener("submit", e => {
const { amountDollars: priceDollars, osparcCredits, paymentMethodId } = e.getData();
const {
amountDollars: priceDollars,
osparcCredits, paymentMethodId
} = e.getData();
const params = {
url: {
walletId: this.__personalWallet.getWalletId()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ qx.Class.define("osparc.desktop.credits.CreditsPerService", {
let totalHours = 0;
entries.forEach(entry => {
totalHours += entry["running_time_in_hours"]
totalCredits+= entry["osparc_credits"]
totalCredits+= parseFloat(entry["osparc_credits"])
});
let datas = [];
entries.forEach(entry => {
datas.push({
service: entry["service_key"],
credits: -1*entry["osparc_credits"],
credits: -1*parseFloat(entry["osparc_credits"]),
hours: entry["running_time_in_hours"],
percentageHours: totalHours ? 100*entry["running_time_in_hours"]/totalHours : 0,
percentageCredits: totalCredits ? 100*entry["osparc_credits"]/totalCredits : 0,
percentageCredits: totalCredits ? 100*parseFloat(entry["osparc_credits"])/totalCredits : 0,
});
});
datas.sort((a, b) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ qx.Class.define("osparc.desktop.credits.CurrentUsage", {
let cost = 0;
currentTasks.forEach(currentTask => {
if (currentTask["credit_cost"]) {
cost += currentTask["credit_cost"];
cost += parseFloat(currentTask["credit_cost"]);
}
});
this.setUsedCredits(cost);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ qx.Class.define("osparc.desktop.credits.TransactionsTableModel", {
rawData.forEach(rawRow => {
data.push({
date: osparc.utils.Utils.formatDateAndTime(new Date(rawRow.createdAt)),
price: rawRow.priceDollars ? rawRow.priceDollars.toFixed(2) : 0,
credits: rawRow.osparcCredits ? rawRow.osparcCredits.toFixed(2) * 1 : 0,
price: rawRow.priceDollars ? parseFloat(rawRow.priceDollars).toFixed(2) : 0,
credits: rawRow.osparcCredits ? parseFloat(rawRow.osparcCredits).toFixed(2) * 1 : 0,
status: this.__addColorTag(rawRow.completedStatus),
comment: rawRow.comment,
invoice: rawRow.invoiceUrl ? this.__createPdfIconWithLink(rawRow.walletId, rawRow.paymentId) : ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
[usageCols.START.id]: start,
[usageCols.DURATION.id]: duration,
[usageCols.STATUS.id]: qx.lang.String.firstUp(rawRow["service_run_status"].toLowerCase()),
[usageCols.COST.id]: rawRow["credit_cost"] ? rawRow["credit_cost"].toFixed(2) : "",
[usageCols.COST.id]: rawRow["credit_cost"] ? parseFloat(rawRow["credit_cost"]).toFixed(2) : "",
[usageCols.USER.id]: rawRow["user_email"]
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ qx.Class.define("osparc.pricing.UnitData", {
this.set({
pricingUnitId: unitData.pricingUnitId ? unitData.pricingUnitId : null,
unitName: unitData.unitName,
currentCostPerUnit: unitData.currentCostPerUnit,
currentCostPerUnit: parseFloat(unitData.currentCostPerUnit),
comment: unitData.comment ? unitData.comment : "",
awsSpecificInfo: unitData.specificInfo && unitData.specificInfo["aws_ec2_instances"] ? unitData.specificInfo["aws_ec2_instances"].toString() : "",
unitExtraInfo: unitData.unitExtraInfo,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ qx.Class.define("osparc.pricing.UnitEditor", {
this.set({
pricingUnitId: pricingUnitData.pricingUnitId,
unitName: pricingUnitData.unitName,
costPerUnit: pricingUnitData.currentCostPerUnit,
costPerUnit: parseFloat(pricingUnitData.currentCostPerUnit),
comment: pricingUnitData.comment ? pricingUnitData.comment : "",
specificInfo: pricingUnitData.specificInfo && pricingUnitData.specificInfo["aws_ec2_instances"] ? pricingUnitData.specificInfo["aws_ec2_instances"].toString() : "",
default: pricingUnitData.default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ qx.Class.define("osparc.widget.PersistentIframe", {
top: this.self().HIDDEN_TOP
});
const iframeEl = this._getIframeElement();
iframeEl.setAttribute("allow", "clipboard-write");
const host = window.location.host;
iframeEl.setAttribute("allow", `clipboard-write; from *.services.${host}`);

const buttonContainer = this.__buttonContainer = new qx.ui.container.Composite(new qx.ui.layout.HBox(10).set({
alignX: "right",
Expand Down
Loading