Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
20 changes: 10 additions & 10 deletions WebAPP/App/Controller/AddCase.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ export default class AddCase {
Message.bigBoxDanger('Technology deletion error', `Wrong index!! <b>${model.techs[id].Tech}</b>?`, 3000);
}
if(model.techs[id].TG.length>0){
Message.confirmationDialog('Technology deletion warning', `Technology <b>${model.techs[id].Tech}</b> has technology group membership(s). Deleting the technology could impact visalisation of results for previously run cases. Are you sure you want to proceed?`, model, $divTech, id, rowid, techId)
Message.confirmationDialog('Technology deletion warning', `Technology <b>${model.techs[id].Tech}</b> has technology group membership(s). Deleting the technology could impact visualisation of results for previously run cases. Are you sure you want to proceed?`, model, $divTech, id, rowid, techId)
}
else{
$divTech.jqxGrid('deleterow', rowid);
Expand All @@ -362,7 +362,7 @@ export default class AddCase {
}
}
else {
Message.bigBoxWarning('Warning', 'You cannot delete. At least one technology is neccessary.', 3000);
Message.bigBoxWarning('Warning', 'You cannot delete. At least one technology is necessary.', 3000);
}
});

Expand All @@ -373,7 +373,7 @@ export default class AddCase {
var rowBoundIndex = args.rowindex;
var value = args.newvalue.trim();
if (column == 'CapUnitId' || column == 'ActUnitId') {
Message.bigBoxWarning('Unit change warninig!', 'Changing technology unit will not recalculate entered nor default values in the model.', 3000);
Message.bigBoxWarning('Unit change Warning!', 'Changing technology unit will not recalculate entered nor default values in the model.', 3000);
}
if (column != 'IAR' && column != 'OAR' && column != 'EAR' && column != 'INCR' && column != 'ITCR' && column != 'TG') {
model.techs[rowBoundIndex][column] = value;
Expand Down Expand Up @@ -559,7 +559,7 @@ export default class AddCase {

let rowId = model.seCount-1;
if(rowId == 0){
Message.bigBoxWarning('Warning', 'You cannot delete. At least one season is neccessary.', 3000);
Message.bigBoxWarning('Warning', 'You cannot delete. At least one season is necessary.', 3000);
}else{
var seId = $divSe.jqxGrid('getcellvalue', rowId, 'SeId');
$divSe.jqxGrid('deleterow',rowId );
Expand Down Expand Up @@ -647,7 +647,7 @@ export default class AddCase {

let rowId = model.dtCount-1;
if(rowId == 0){
Message.bigBoxWarning('Warning', 'You cannot delete. At least one day type is neccessary.', 3000);
Message.bigBoxWarning('Warning', 'You cannot delete. At least one day type is necessary.', 3000);
}else{
var dtId = $divDt.jqxGrid('getcellvalue', rowId, 'DtId');
$divDt.jqxGrid('deleterow',rowId );
Expand Down Expand Up @@ -735,7 +735,7 @@ export default class AddCase {
let rowId = model.dtbCount-1;
var dtbId = $divDtb.jqxGrid('getcellvalue', rowId, 'DtbId');
if(rowId == 0){
Message.bigBoxWarning('Warning', 'You cannot delete. At least one daily itme bracket is neccessary.', 3000);
Message.bigBoxWarning('Warning', 'You cannot delete. At least one daily item bracket is necessary.', 3000);
}else{
$divDtb.jqxGrid('deleterow',rowId );
model.dailytimebrackets.splice(rowId, 1);
Expand Down Expand Up @@ -817,7 +817,7 @@ export default class AddCase {
});
}
else{
Message.bigBoxWarning('Warning', 'You cannot delete. At least one commodity is neccessary.', 3000);
Message.bigBoxWarning('Warning', 'You cannot delete. At least one commodity is necessary.', 3000);
}
});

Expand All @@ -828,7 +828,7 @@ export default class AddCase {
var value = args.newvalue.trim();
model.commodities[rowBoundIndex][column] = value;
if (column == 'UnitId') {
Message.bigBoxWarning('Unit change warninig!', 'Changing commodity unit will not recalculate entered nor default values in the model.', 3000);
Message.bigBoxWarning('Unit change Warning!', 'Changing commodity unit will not recalculate entered nor default values in the model.', 3000);
}
if (column == 'Comm') {
var commId = $divComm.jqxGrid('getcellvalue', rowBoundIndex, 'CommId');
Expand Down Expand Up @@ -883,7 +883,7 @@ export default class AddCase {
var value = args.newvalue.trim();
model.emissions[rowBoundIndex][column] = value;
if (column == 'UnitId') {
Message.bigBoxWarning('Unit change warninig!', 'Changing emission unit will not recalculate entered nor default values in the model.', 3000);
Message.bigBoxWarning('Unit change Warning!', 'Changing emission unit will not recalculate entered nor default values in the model.', 3000);
}
if (column == 'Emis') {
var emisId = $divEmi.jqxGrid('getcellvalue', rowBoundIndex, 'EmisId');
Expand Down Expand Up @@ -964,7 +964,7 @@ export default class AddCase {
if(model.caserunByScenario[model.scenarios[id]['ScenarioId']].length != 0){
Message.bigBoxDanger('Alert',
`You cannot delete this scenario. It is used in ${model.caserunByScenario[model.scenarios[id]['ScenarioId']]} caserun(s)!
Plese reomve these scenario from caseruns before deletion.`, null)
Please remove these scenario from caseruns before deletion.`, null)
}
else{
let scId = model.scenarios[id]['ScenarioId'];
Expand Down
4 changes: 2 additions & 2 deletions WebAPP/App/Controller/DataFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ export default class DataFile {
$("#osy-batchRun").on('click', function (event) {
//console.log('BATCH RUN')
Pace.restart();
Message.loaderStart('BATCH RUN! Plese wait...');
Message.loaderStart('BATCH RUN! Please wait...');

let batchRunCases = [];
$("input:checkbox[name=type]:checked").each(function(){
Expand Down Expand Up @@ -836,7 +836,7 @@ export default class DataFile {
$("#osy-cleanUp").on('click', function (event) {
//console.log('BATCH RUN')
Pace.restart();
Message.loaderStart('Recycle all results! Plese wait...');
Message.loaderStart('Recycle all results! Please wait...');

Osemosys.cleanUp(model.casename)
.then(response => {
Expand Down
Loading