Skip to content
Snippets Groups Projects
Commit 34210bdf authored by Tamas Kis's avatar Tamas Kis
Browse files

[master] fixing GUIEditor chart request file export 


Signed-off-by: default avatarTamas Levente Kiss <tamas.levente.kiss@ericsson.com>
parent 27d4ebc4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/Main.html deleted 100644 → 0
+ 1
− 75
View file @ 27d4ebc4
<!DOCTYPE html>
<!--Copyright (c) 2000-2017 Ericsson Telecom AB
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http:www.eclipse.org/legal/epl-v10.html -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8">
<!-- CSS -->
<link rel="stylesheet" type="text/css" href="WebApplicationFramework/Res/Main.css" />
<!--link rel="stylesheet" type="text/css" href="Libs/JQueryUI/themes/cupertino/jquery-ui.min.css" /-->
<link rel="stylesheet" type="text/css" href="Libs/JQueryUI/jquery-ui.css" />
<!--link rel="stylesheet" type="text/css" href="Libs/JQueryUI/jquery-ui.structure.css" /-->
<!--link rel="stylesheet" type="text/css" href="Libs/JQueryUI/jquery-ui.theme.css" /-->
<link rel="stylesheet" type="text/css" href="Libs/jsTree/themes/default/style.min.css" />
<link rel="stylesheet" type="text/css" href="Libs/Codemirror/codemirror.css" />
<!-- GENERAL LIBS -->
<script src="Utils/Polyfill.js"></script>
<script src="Utils/Compat.js"></script>
<!-- Polyfill the Zeroth, for the old browsers. -->
<script src="Libs/JQuery/jquery-2.2.3.min.js"></script>
<script src="Libs/JQuery/jquery.svg.js"></script>
<script src="Libs/jsTree/jstree.min.js"></script>
<script src="Libs/JQueryUI/jquery-ui.js "></script>
<script src="Libs/AJV/ajv.min.js"></script>
<script src="Libs/Html2Canvas/html2canvas.js"></script>
<script src="Libs/Flot/jquery.flot.min.js"></script>
<script src="Libs/Flot/jquery.flot.time.js"></script>
<script src="Libs/Flot/jquery.flot.resize.min.js"></script>
<script src="Libs/Flot/jquery.flot.navigate.min.js"></script>
<!-- Customized libs -->
<script src="Libs/JSONEditor/jsoneditor.custom.js"></script>
<script src="Libs/Codemirror/codemirror.custom.js"></script>
<!-- GENERAL UTILITIES -->
<script src="Utils/Utilities.js"></script>
<script src="Utils/LineDrawer.js"></script>
<script src="Utils/FileHandler.js"></script>
<script src="Utils/TaskUtils.js"></script>
<script src="Utils/JsonLoader.js"></script>
<script src="Utils/FileLoader.js"></script>
<script src="Utils/DataSourceUtils.js"></script>
<script src="Utils/JsTreeUtils.js"></script>
<script src="Utils/ViewUtils.js"></script>
<script src="Utils/RequestBuilderFromHelp_full.js"></script>
<script src="Utils/RequestBuilderFromHelp_manual.js"></script>
<script src="Utils/HelpTreeBuilder.js"></script>
<!-- MAIN SCRIPTS -->
<script src="WebApplicationFramework/FrameworkMain.js"></script>
<script src="WebApplicationFramework/Setup_Model.js"></script>
<script src="WebApplicationFramework/WebApp_Model.js"></script>
<title>TitanSim RnXnn</title>
</head>
<body>
<div id="TSGuiFrameworkMain">
<div id="applications_header_container">
<!--div class="line"></div-->
<div id="applications_header" class="applications_header_class">
<!-- toggle for hidden applications, connected code can also be found in FrameworkMain.js and Main.css -->
<!--div id="webappToggle"><button id="webappToggleButton"><span><img src="WebApplicationFramework/Res/grip_gray.png"/></span></button></div>
<div id="hiddenWebapps" class="hidden"></div-->
<div id="webapps"></div>
<div id="eriHdr"><span><img class="margin_logo" src="WebApplicationFramework/Res/ericsson.png"/>TitanSim RnXnn</span></div>
</div>
<div class="line"></div>
</div>
</div>
</body>
</html>
htdocs/Main.html 0 → 120000
+ 1
− 75
View file @ 34210bdf
index.html
\ No newline at end of file
htdocs/WebApplications/GuiEditor/Models/Model.js
+ 5
− 4
View file @ 34210bdf
......@@ -108,7 +108,7 @@ function GuiEditor_Model(p_webAppModel, p_framework, p_extension) {
this.globalSetupSearch = v_setupModel.globalSetupSearch;
this.exportChartRequest = function(callback) {
var exporter = new ChartRequestCreator(v_baseModel.getFileHandler(), callback);
var exporter = new ChartRequestCreator(v_baseModel.getFileHandler(), v_baseModel.getAppConfig().lastEditedApp, callback);
exporter.run();
};
......@@ -399,7 +399,7 @@ function GuiEditor_Model(p_webAppModel, p_framework, p_extension) {
this.getFileHandler = v_baseModel.getFileHandler;
}
function ChartRequestCreator(p_fileHandler, p_callback) {
function ChartRequestCreator(p_fileHandler, p_appDirectory, p_callback) {
var v_fileHandler = p_fileHandler;
var v_callback = p_callback;
......@@ -411,8 +411,9 @@ function ChartRequestCreator(p_fileHandler, p_callback) {
var v_chartRequest = [];
var v_setupLoader = new CSetup_Model(v_fileHandler);
var v_chartSaver = new JsonLoader("CustomizableContent/CustomizableApp/TimelineRequest.json", v_fileHandler, v_chartRequest);
var v_setupLoader = new CSetup_Model(v_fileHandler);
v_setupLoader.setSetupDirectory(p_appDirectory + "/Setups");
var v_chartSaver = new JsonLoader(p_appDirectory + "/TimelineRequest.json", v_fileHandler, v_chartRequest);
this.run = function() {
function setupsListed(setups) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent