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
8 changes: 0 additions & 8 deletions WebAPP/App/Controller/AddCase.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ export default class AddCase {
AddCase.initPage(model);
})
.catch(error => {
console.log(' error ', error)
Message.bigBoxDanger(error);
})
}
Expand Down Expand Up @@ -96,7 +95,6 @@ export default class AddCase {
}

static initEvents(model) {
console.log('model ', model)
let $divTech = $("#osy-gridTech");
let $divTechGroup = $("#osy-gridTechGroup");
let $divStg = $("#osy-gridStg");
Expand Down Expand Up @@ -326,7 +324,6 @@ export default class AddCase {
//sortingn ne utice na rowid i id i index
var rowid = $divTech.jqxGrid('getrowid', id);

console.log('rowid id ', rowid,id)
//var rows = $divTech.jqxGrid('getboundrows');
// // console.log('rows[rowId].uid ', rows[rowid].uid);
// // console.log('rows[id]].uid ', rows[id].uid);
Expand All @@ -340,7 +337,6 @@ export default class AddCase {
//provjera da brisemo tacnu tehnologiju
//console.log('techIds ', model.techs[id].TechId,techId, htmltechId, model.techNames[techId], model.techNames[model.techs[id].TechId], model.techNames[htmltechId])
if(model.techs[id].TechId != techId ||techId != htmltechId){
console.log('delete tech')
Message.bigBoxDanger('Technology deletion error', `Wrong index!! <b>${model.techs[id].Tech}</b>?`, 3000);
}
if(model.techs[id].TG.length>0){
Expand Down Expand Up @@ -586,7 +582,6 @@ export default class AddCase {
model.seasons[rowBoundIndex][column] = value;
if (column == 'Se') {
var seId = $divSe.jqxGrid('getcellvalue', rowBoundIndex, 'SeId');
console.log('seId ', seId, value)
model.seNames[seId] = value;
}
});
Expand Down Expand Up @@ -743,7 +738,6 @@ export default class AddCase {
delete model.dtbNames[dtbId];
//ovdje trebamo izbaciti season iz timeslice definicije
$.each(model.timeslices, function (id, obj) {
console.log('dtbCount ', id, obj, dtbId)
if(obj.DTB == dtbId){
obj.DTB='DTB_0';
}
Expand Down Expand Up @@ -900,7 +894,6 @@ export default class AddCase {
let defaultStg = DefaultObj.defaultStg();
model.stg.push(JSON.parse(JSON.stringify(defaultStg[0], ['StgId', 'Stg', 'Desc',"UnitId", "TTS","TFS", "Operation"])));
//update stgames
console.log('defaultStg ',defaultStg)
model.stgNames[defaultStg[0]['StgId']] = defaultStg[0]['Stg'];
//add row
$divStg.jqxGrid('addrow', null, defaultStg);
Expand Down Expand Up @@ -934,7 +927,6 @@ export default class AddCase {
model.stg[rowBoundIndex][column] = value;
if (column == 'Stg') {
var stgId = $divStg.jqxGrid('getcellvalue', rowBoundIndex, 'StgId');
console.log('stgId ', stgId, value)
model.stgNames[stgId] = value;
}
});
Expand Down
7 changes: 0 additions & 7 deletions WebAPP/App/Controller/DataFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,6 @@ export default class DataFile {
}
})
.catch(error => {
console.log('error ',error)
Message.loaderEnd();
Message.bigBoxDanger('Error message', error, null);
})
Expand All @@ -582,7 +581,6 @@ export default class DataFile {
e.stopImmediatePropagation();
Html.renderScOrder( model.scBycs[model.cs]);
Message.clearMessages();
console.log('select, ', model)
var caserunanme = $(this).attr('data-ps');
model.cs = caserunanme;
Html.renderScOrder( model.scBycs[model.cs]);
Expand Down Expand Up @@ -616,7 +614,6 @@ export default class DataFile {
})
.then(data => {
let [DataFile, ResultCSV] = data;
console.log('data ', data)
if (ResultCSV.length != 0) {
$(".Results").show();
Html.renderCSV(ResultCSV, model.cs)
Expand Down Expand Up @@ -758,7 +755,6 @@ export default class DataFile {

})
.catch(error => {
console.log(error)
Message.danger(error);
});
}
Expand Down Expand Up @@ -836,7 +832,6 @@ export default class DataFile {

})
.catch(error => {
console.log(error)
Message.danger(error);
});
}
Expand Down Expand Up @@ -934,8 +929,6 @@ export default class DataFile {
$("#osy-lpOutput").empty();
$('.Cases').tab('show');

console.log('response clean up ', response)

Sidebar.Reload(model.casename);
Message.clearMessages();

Expand Down
3 changes: 0 additions & 3 deletions WebAPP/App/Controller/LegacyImport.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export default class LegacyImport {
var date = $("#osy-date").val();
var currency = $("#osy-currency").val();
var templateName = $("#osy-template").val();
console.log('templateName ', templateName)
let data = false;
if ($('#osy-data').is(":checked")){
data = true;
Expand All @@ -127,7 +126,6 @@ export default class LegacyImport {
}
Osemosys.importTemplate(POSTDATA)
.then(response => {
console.log('response ', response)
if (response.status_code == "success") {
Message.loaderEnd();
//console.log('response ', response)
Expand All @@ -139,7 +137,6 @@ export default class LegacyImport {
}
})
.catch(error => {
console.log('error ', error)
Message.loaderEnd();
Message.bigBoxDanger('Error message', error, null);
})
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Controller/RESViewerMermaid.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export default class RESViewer {
this.initEvents(model);
})
.catch(error => {
console.log('error ', error)
Message.warning(error);
});
}
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Controller/RTSM.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ export default class RTSM {
e.stopImmediatePropagation();
var sc = $("#osy-scenarios").val();
Html.lblScenario(sc);
console.log('sc ', sc)
Grid.applyRSTMFilter($divGrid, sc, model.param);
Message.smallBoxInfo('Info', 'Scenario data opened!', 2000);
});
Expand Down
3 changes: 0 additions & 3 deletions WebAPP/App/Controller/RYDtb.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@ export default class RYDtb {
delete obj.ScId;
});

console.log('param ', param)
console.log('savedata ', saveData)

Osemosys.updateData(saveData, param, "RYDtb.json")
.then(response => {
//model.gridData[model.param] = JSON.parse(daRYTsData);
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Controller/RYS.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export default class RYS {


static initPage(model) {
console.log('model ', model)
Message.clearMessages();
//Navbar.initPage(model.casename);
Html.title(model.casename, model.PARAMNAMES[model.param], GROUPNAMES[model.group]);
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Controller/RYT.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export default class RYT {


static initPage(model) {
console.log('model ', model)
Message.clearMessages();
//Navbar.initPage(model.casename);
Html.title(model.casename, model.PARAMNAMES[model.param], GROUPNAMES[model.group]);
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Controller/RYTC.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export default class RYTC {
}
})
.catch(error => {
console.log('error ', error)
if (error.status_code == 'CaseError') {
MessageSelect.init(RYTC.refreshPage.bind(RYTC));
}
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Controller/RYTTs.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ export default class RYTTs {
}
}).on('cellvaluechanged', function (event) {
if (!pasteEvent) {
console.log('not paste')
//Pace.restart();
pasteEvent = false;
var args = event.args;
Expand Down
4 changes: 1 addition & 3 deletions WebAPP/App/Controller/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,9 @@ export default class Settings {

})
.then((data) =>{
let [session, module] = data;
console.log(pageId, module, session);
let [session, module] = data;
const AddCase = module.default;
const casename = session['session'];
console.log('units from strogae ',JSON.parse(localStorage.getItem("osy-units")))
// Call the onLoad method
AddCase.refreshPage(casename);
})
Expand Down
2 changes: 0 additions & 2 deletions WebAPP/App/Controller/ViewData.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ export default class ViewData {
let $divTEGrid = $('#osy-gridRT');

var daRTGrid = new $.jqx.dataAdapter(model.srcRTGrid, { autoBind: true });
console.log('daRTGrid', daRTGrid.records);
Grid.Grid($divTEGrid, daRTGrid, model.columnsRT, { height:200});
Grid.applyTEviewDataFilter($divTEGrid);

Expand Down Expand Up @@ -395,7 +394,6 @@ export default class ViewData {
let rytData = $divGrid.jqxGrid('getdisplayrows');
let data = JSON.parse(JSON.stringify(rytData, ['Sc', 'paramName', 'UnitId', 'TechName', "CommName", "EmisName", "ConName", 'Ts', 'MoId'].concat(model.years)));

console.log('data', data);
Base.prepareCSV(model.casename, data)
.then(response =>{
Message.smallBoxInfo('Case study message', response.message, 3000);
Expand Down
9 changes: 0 additions & 9 deletions WebAPP/App/Model/RESViewer.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ export class Model {
let resData = DataModel.RESData(genData, DemandComms);
let techData = DataModel.getTechData(genData);
let commData = DataModel.getCommData(genData);


console.log('resData ', resData)

let index = 0;
let labelIndex = {};
Expand Down Expand Up @@ -208,12 +205,6 @@ export class Model {



console.log('source ', source)
console.log('target ', target)
console.log('value ', value)
console.log('labelLink ', labelLink)
console.log('colorLink ', colorLink)

let labelCount = source.length;
this.selectedTechs = selectedTechs;
this.dispayedTechs = dispayedTechs;
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Model/RS.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export class Model {
let scenarios = genData['osy-scenarios'];
this.param = param;

console.log(RSdata, group, PARAMETERS, param)
let RSgrid = DataModel.RSgrid(genData, RSdata, PARAMETERS);
let RSchart = DataModel.RSchart(genData, RSdata);
let PARAMNAMES = DataModel.ParamName(PARAMETERS[group]);
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Model/RT.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export class Model {
if (['TMPAL', 'TMPAU'].includes(this.param)){
return true;
}else{
console.log('Number.isInteger(value) ', value, Number.isInteger(value))
if (value < 0) {
return { result: false, message: 'Value must be positive!' };
}
Expand Down
2 changes: 0 additions & 2 deletions WebAPP/App/Model/RTSM.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ export class Model {

let RTSMgrid = DataModel.RTSMgrid(genData, RTSMdata, PARAMETERS);

console.log('RTSMgrid ', RTSMgrid)

// let techIds = DataModel.TechId(genData);
// let ActivityTechs = DataModel.activityTechs(techs);
// let ActivityComms = DataModel.activityComms(genData);
Expand Down
4 changes: 0 additions & 4 deletions WebAPP/App/Model/RYDtb.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ export class Model {
}

let cellsrenderer = function (row, columnfield, value, defaulthtml, columnproperties) {
// if(columnfield = '2020')
// console.log('ROW, COLUMN, VALUE ', row, columnfield, value)
if(row == 4 && columnfield == '2020')
console.log('row renderer ', row, 'row renderer value ', value)
if (value === null || value === '') {
return '<span style="margin: 4px; float:right; ">n/a</span>';
} else {
Expand Down
2 changes: 0 additions & 2 deletions WebAPP/App/Model/RYSeDt.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ export class Model {
let PARAMNAMES = DataModel.ParamName(PARAMETERS[group]);
let RYSeDtgrid = DataModel.RYSeDtgrid(genData, RYCTsdata, PARAMETERS);

console.log('RYSeDtgrid ',RYSeDtgrid)

let years = genData['osy-years'];
let seasons = genData['osy-se'];
let scenarios = genData['osy-scenarios'];
Expand Down
1 change: 0 additions & 1 deletion WebAPP/App/Model/RYTSM.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export class Model {

let RYTSMgrid = DataModel.RYTSMgrid(genData, RYTSMdata, PARAMETERS);

console.log('RYTSMgrid ', RYTSMgrid)
let techIds = DataModel.TechId(genData);
let ActivityTechs = DataModel.activityTechs(techs);
let ActivityComms = DataModel.activityComms(genData);
Expand Down
4 changes: 0 additions & 4 deletions WebAPP/App/Model/RYTs.Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ export class Model {
}

let cellsrenderer = function (row, columnfield, value, defaulthtml, columnproperties) {
// if(columnfield = '2020')
// console.log('ROW, COLUMN, VALUE ', row, columnfield, value)
if(row == 4 && columnfield == '2020')
console.log('row renderer ', row, 'row renderer value ', value)
if (value === null || value === '') {
return '<span style="margin: 4px; float:right; ">n/a</span>';
} else {
Expand Down
Loading