Commit e9a97956 authored by patri's avatar patri
Browse files

add history

--> still errors
--> not ready for deployment yet
parent 3bff2c05
......@@ -10,5 +10,5 @@
"widgets" : {
"type": "vcs.vcm.widgets.Questionnaire",
"name": "Questionnaire"
},
}
}
\ No newline at end of file
......@@ -657,7 +657,9 @@
" </div>",
"<p class='balloon-text'><span>Um die Umfrage zu starten klicken Sie bitte hier!</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/Umfrage.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -682,7 +684,9 @@
"<input type='checkbox' name='toggle' id='chxboxDemand' onclick='checkboxDemandCampus(true);'>",
"<label for='toggle'><i></i></label>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"</div>",
"<% %>"
......@@ -703,7 +707,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<img style='padding-top:10px' src='images/NordB/001.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -733,7 +739,9 @@
"<p>noise_LA_min: </p><p id='noise_lamin'>&nbsp;</p><br>",
"<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
......@@ -764,7 +772,9 @@
"<p>noise_LA_min: </p><p id='noise_lamin'>&nbsp;</p><br>",
"<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
......@@ -796,7 +806,9 @@
"<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
"<span></span>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
......@@ -854,7 +866,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Gartenkiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station2_gartenkiosk.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -874,6 +888,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'>Die Umfrage finden Sie im Bereich rechts.</p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% zoomto(\"UmfrageNordb\") %>"
......@@ -893,6 +910,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Mit dem Rosenstein Viertel entsteht ein neuer, nachhaltiger und klimagerechter Stadtbaustein in Stuttgart. Die gesamte Planung umfasst die freiwerdenden Gleisflächen, den Gleisbogen sowie das Gebiet an den Wagenhallen.</span><br> <a href='https://www.stuttgart.de/leben/stadtentwicklung/rosenstein-quartier.php'>Hier geht’s zum Konzept</a></p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
],
......@@ -912,6 +932,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Der Laden informiert über Planung und Bau des Bahnprojekts Stuttgart 21 sowie der daran anschließenden Stadt- und Landschaftsplanung und dient damit auch als Anlaufstelle.</span><br> <a href='http://infoladen-rosenstein.de/'>Hier geht’s zur Seite</a></p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
],
......@@ -930,6 +953,9 @@
" <div class='balloon-content' style='height:290px; margin-right: 0px;'",
" </div>",
"<p class='balloon-text'><span>Das Gebiet rund um die sanierten Wagenhallen gilt als Ort der Kunst und Subkultur, an dem diverse Vereine und Initiativen kulturell und sozial nachhaltig aktiv sind. Der <a href='http://kunstverein-wagenhalle.de/'>Kunstverein Wagenhalle e.V.</a> betreibt die Ateliers innerhalb der Hallen sowie die Container City, während auf den anliegenden Grünflächen der <a href='https://www.stadtacker.de/'>Verein Stadtacker</a> zum Urban Gardening einlädt.</span><br> </p>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>"
],
......@@ -950,7 +976,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Spielekiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station1_spielekiosk.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -972,7 +1000,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Outdoorkiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station3_outdoorkiosk1.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......@@ -994,7 +1024,9 @@
" </div>",
"<p class='balloon-text'><span>hier wurde eine Infokiosk errichtet.</span><br></p>",
"<img style='padding-top:10px' src='images/content/contentboeckingerstrasse/station4_infokiosk.jpg' alt='Simply Easy Learning' width='375'>",
"<div class='balloon-close-col'>",
"<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
"</div>",
"</div>",
"<% %>",
"<% openquestionaire() %>"
......
......@@ -168,7 +168,7 @@
<strong>Kesselkompass</strong> <br>Informieren, Beteiligen, Kooperieren
</h1>
<p class="contentOne">Willkommen auf der 3D-Partizipationsplattform Kesselkompass, ein Transferprojekt des M4_Lab an der Hochschule für Technik Stuttgart. Hier finden Sie Informationen und die Möglichkeit zur Beteiligung an unterschiedlichen Forschungsprojekten im Raum Stuttgart, die sich mit städtischer Planung auseinandersetzen. Über die 3D-Kartenansicht der Stadt Stuttgart können Sie verschiedene digitale Werkzeuge nutzen, wissenschaftliche Daten visualisieren, sich über Projekte und Planungen informieren, an Umfragen teilnehmen oder neue Anregungen und Kooperationspartner*innen finden. Viel Spaß beim Stöbern!</p>
<button id="tourstart-btn" onclick="removebuildings(); Introshow();" class="buttonset one"><span class="i18n_balloon_startscreen_btn">Start</span>
<button id="tourstart-btn" onclick="removebuildings(); Introshow();histStart();historyInfo();" class="buttonset one"><span class="i18n_balloon_startscreen_btn">Start</span>
</button>
<!-- stopStory(); getNAVcar(); -------Test back to start: getFlow();getFlowtest();getTraffic(); -->
</div>
......@@ -181,12 +181,12 @@
<div class="tour-top-navi" style="z-index:99">
<div id="updown" onclick="changesize()" style="display: block; font-size: 20px; padding-left: 48%; margin-right: -50%; position: -webkit-sticky; position: sticky;">&#9650</div>
<a href="#" onclick="Introshow();setpositionVAR(false);zoomto('IntroProj')" id = "btn_intro" class=" top-nav buttonset one btn_home btn_size">Info</a>
<a href="#" onclick="zoomto('ProjektePage');Projektshow()" id = "btn_intro" class=" top-nav buttonset one btn_home btn_size">Projekte</a>
<a href="#" onclick="Introshow();setpositionVAR(false);zoomto('IntroProj');historyInfo();histInfo();" id = "btn_intro" class=" top-nav buttonset one btn_home btn_size">Info</a>
<a href="#" onclick="zoomto('ProjektePage');Projektshow();historyProjekt();histProjekt();" id = "btn_intro02" class=" top-nav buttonset one btn_home btn_size">Projekte</a>
<!-- <a href="#" onclick="addcont('main_bock2');showtourSpecific('main');setpositionVAR(false);zoomto('projektOne')" id = "btn_bock" class=" top-nav buttonset one btn_home btn_size"><i class="fa fa-code-fork"></i> Böckingerstraße</a>
<a href="#" onclick="removebuildings();addcont('main_nordbstuff2');NordbahnhofText();setpositionVAR(false);zoomto('NordbahnhofInfo')" id = "btn_nord" class=" top-nav buttonset one btn_home btn_size"><i class="fa fa-code-fork"></i> Nordbahnhof</a> -->
<!-- <a href="#" onclick="NoiseText(true);setpositionVAR(false);" id = "btn_acous" class=" top-nav buttonset one btn_home btn_size"><i class="fa fa-code-fork"></i> Akkustik Projekt</a> -->
<a href="#" style="float: right; margin-right: 7px; " onclick="removebuildings();addcont('main_bock');addcont('main_heatdem');addcont('main_nordbstuff');Expert();setpositionVAR(false);zoomto('Expertenmodus');" id = "btn_expert" class=" top-nav buttonset one btn_home btn_size"><i id="icon_lock" class="fa fa-lock"></i> Toolbox</a>
<a href="#" style="float: right; margin-right: 7px; " onclick="removebuildings();addcont('main_bock');addcont('main_heatdem');addcont('main_nordbstuff');Expert();setpositionVAR(false);zoomto('Expertenmodus');historyToolbox();histExpert();" id = "btn_expert" class=" top-nav buttonset one btn_home btn_size"><i id="icon_lock" class="fa fa-lock"></i> Toolbox</a>
<!-- style="float:right;margin-right:2em;" -->
</div>
<!-- Expertenmodus-.--------------------------
......@@ -848,8 +848,11 @@
vcs.vcm.Framework.activateLogging();
vcs.vcm.Framework.loadConfig('config.json');
</script-->
<script src="lib/jquery-3.5.1.min.js"></script>
<script src='js/history.js'></script>
<script src='js/backtotop.js'></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> -->
<script src='lib/vcm_ui.js'></script>
<script src="js/SimStadtApi_stud.js"></script>
<script src="js/here.js"></script>
......
// Server
var navPublicT = '/partizipation/navPublicT'
var NavCARdata = '/partizipation/NavCARdata'
var ROAD_CLOSURE ="https://m4lab.hft-stuttgart.de/partizipation/ROAD_CLOSURE"
var CONSTRUCTION = "https://m4lab.hft-stuttgart.de/partizipation/CONSTRUCTION"
var TrafficFlow ="https://m4lab.hft-stuttgart.de/partizipation/TrafficFlow"
var NAVCAR = "https://m4lab.hft-stuttgart.de/partizipation/NAVCAR"
var NAVPUB = "https://m4lab.hft-stuttgart.de/partizipation/NAVPUB"
var addPointurl = "https://m4lab.hft-stuttgart.de/partizipation/addPoint"
var routecalcurl = "https://m4lab.hft-stuttgart.de/partizipation/Routecalc2"
var navpublict2url = "https://m4lab.hft-stuttgart.de/partizipation/navPublicT2"
var StartpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Startpoint"
var EndpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Endpoint"
var FLOWdataUrl = "/partizipation/FLOWdata"
var NavCARdataUrl = '/partizipation/NavCARdata'
var FLOWtestUrl = '/partizipation/FLOWtest'
var getTrafficIncidentsUrl = '/partizipation/getTrafficIncidents'
var navPointUrl = '/partizipation/navPoint'
var RoutecalcUrl = '/partizipation/Routecalc'
var navPublicTUrl = '/partizipation/navPublicT'
var NoiseRealTimeUrl = '/partizipation/NoiseRealTime'
var FavoritePlacesUrl = "https://m4lab.hft-stuttgart.de/partizipation/FavPlacesDB"
var getNoiseHistUrl = '/partizipation/getNoiseHist'
var getSTANoiseHistUrl = '/partizipation/getSTANoiseHist'
var saveFavPOINT = '/partizipation/saveFavPoint'
// var navPublicT = '/partizipation/navPublicT'
// var NavCARdata = '/partizipation/NavCARdata'
// var ROAD_CLOSURE ="https://m4lab.hft-stuttgart.de/partizipation/ROAD_CLOSURE"
// var CONSTRUCTION = "https://m4lab.hft-stuttgart.de/partizipation/CONSTRUCTION"
// var TrafficFlow ="https://m4lab.hft-stuttgart.de/partizipation/TrafficFlow"
// var NAVCAR = "https://m4lab.hft-stuttgart.de/partizipation/NAVCAR"
// var NAVPUB = "https://m4lab.hft-stuttgart.de/partizipation/NAVPUB"
// var addPointurl = "https://m4lab.hft-stuttgart.de/partizipation/addPoint"
// var routecalcurl = "https://m4lab.hft-stuttgart.de/partizipation/Routecalc2"
// var navpublict2url = "https://m4lab.hft-stuttgart.de/partizipation/navPublicT2"
// var StartpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Startpoint"
// var EndpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Endpoint"
// var FLOWdataUrl = "/partizipation/FLOWdata"
// var NavCARdataUrl = '/partizipation/NavCARdata'
// var FLOWtestUrl = '/partizipation/FLOWtest'
// var getTrafficIncidentsUrl = '/partizipation/getTrafficIncidents'
// var navPointUrl = '/partizipation/navPoint'
// var RoutecalcUrl = '/partizipation/Routecalc'
// var navPublicTUrl = '/partizipation/navPublicT'
// var NoiseRealTimeUrl = '/partizipation/NoiseRealTime'
// var FavoritePlacesUrl = "https://m4lab.hft-stuttgart.de/partizipation/FavPlacesDB"
// var getNoiseHistUrl = '/partizipation/getNoiseHist'
// var getSTANoiseHistUrl = '/partizipation/getSTANoiseHist'
// var saveFavPOINT = '/partizipation/saveFavPoint'
......@@ -31,27 +31,27 @@ var saveFavPOINT = '/partizipation/saveFavPoint'
//_________________________________________/
// Local
// var navPublicT = '/navPublicT'
// var NavCARdata = '/NavCARdata'
// var ROAD_CLOSURE = "http://localhost:8083/ROAD_CLOSURE"
// var CONSTRUCTION = "http://localhost:8083/CONSTRUCTION"
// var TrafficFlow = "http://localhost:8083/TrafficFlow"
// var NAVCAR = "http://localhost:8083/NAVCAR"
// var NAVPUB = "http://localhost:8083/NAVPUB"
// var addPointurl = "http://localhost:8083/addPoint"
// var routecalcurl = "http://localhost:8083/Routecalc2"
// var navpublict2url = "http://localhost:8083/navPublicT2"
// var StartpointUrl = "http://localhost:8083/Startpoint"
// var EndpointUrl = "http://localhost:8083/Endpoint"
// var FLOWdataUrl = "/FLOWdata"
// var NavCARdataUrl = '/NavCARdata'
// var FLOWtestUrl = '/FLOWtest'
// var getTrafficIncidentsUrl = '/getTrafficIncidents'
// var navPointUrl = '/navPoint'
// var RoutecalcUrl = '/Routecalc'
// var navPublicTUrl = '/navPublicT'
// var NoiseRealTimeUrl = '/NoiseRealTime'
// var FavoritePlacesUrl = 'http://localhost:8083/FavPlacesDB'
// var getNoiseHistUrl = '/getNoiseHist'
// var getSTANoiseHistUrl = '/getSTANoiseHist'
// var saveFavPOINT = '/saveFavPoint'
\ No newline at end of file
var navPublicT = '/navPublicT'
var NavCARdata = '/NavCARdata'
var ROAD_CLOSURE = "http://localhost:8083/ROAD_CLOSURE"
var CONSTRUCTION = "http://localhost:8083/CONSTRUCTION"
var TrafficFlow = "http://localhost:8083/TrafficFlow"
var NAVCAR = "http://localhost:8083/NAVCAR"
var NAVPUB = "http://localhost:8083/NAVPUB"
var addPointurl = "http://localhost:8083/addPoint"
var routecalcurl = "http://localhost:8083/Routecalc2"
var navpublict2url = "http://localhost:8083/navPublicT2"
var StartpointUrl = "http://localhost:8083/Startpoint"
var EndpointUrl = "http://localhost:8083/Endpoint"
var FLOWdataUrl = "/FLOWdata"
var NavCARdataUrl = '/NavCARdata'
var FLOWtestUrl = '/FLOWtest'
var getTrafficIncidentsUrl = '/getTrafficIncidents'
var navPointUrl = '/navPoint'
var RoutecalcUrl = '/Routecalc'
var navPublicTUrl = '/navPublicT'
var NoiseRealTimeUrl = '/NoiseRealTime'
var FavoritePlacesUrl = 'http://localhost:8083/FavPlacesDB'
var getNoiseHistUrl = '/getNoiseHist'
var getSTANoiseHistUrl = '/getSTANoiseHist'
var saveFavPOINT = '/saveFavPoint'
\ No newline at end of file
/***************************************************************
* Copyright (C) 2016 punkt.de GmbH
* Authors: Christoph Heidenreich
*
* This script is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This script is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
// window.addEventListener("load", function(event) {
var StateofHist = "start01"
var stateObj = {info: "start01"};
// history.replaceState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.replaceState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
console.log("start01")
// document.body.style.backgroundColor = "yellow";
// });
function historyInfo(){
console.log(StateofHist)
console.log("info01")
StateofHist = "info01"
var stateObj = {info: StateofHist};
// history.pushState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.pushState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
}
function historyProjekt(){
console.log("project01")
console.log(StateofHist)
StateofHist = "project01"
var stateObj = {info: StateofHist};
// history.pushState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.pushState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
}
function historyToolbox(){
console.log("toolbox01")
console.log(StateofHist)
StateofHist = "toolbox01"
var stateObj = {info: StateofHist};
// history.pushState(stateObj, "neuerChronikEintrag", "https://transfer.hft-stuttgart.de/partizipation/weilimdorf/#/");
history.pushState(stateObj, "neuerChronikEintrag", "http://localhost:8083/");
}
function histStart() {
// StateofHist = "intro01"
}
function histInfo() {
// StateofHist = "intro01"
}
function histProjekt() {
// StateofHist = "project01"
}
function histExpert() {
// StateofHist = "toolbox01"
}
jQuery(document).ready(function() {
var $ = jQuery;
//--------------------------------------------------------------------------
// handle history.back functionality in event
// replace html and set active menu to restore dynamic made changes on page
//--------------------------------------------------------------------------
window.addEventListener('popstate', function(event) {
console.log(event.state)
if (event.state !== null && event.state !== undefined) {
// alert(event.state.info)
if (event.state.info == "start01"){
activateStoryFrame("1")
console.log("start01_a")
} else if (event.state.info == "info01"){
activateStoryFrame("2")
console.log("info01_a")
} else if (event.state.info == "project01"){
activateStoryFrame("3")
console.log("project01_a")
} else if (event.state.info == "toolbox01") {
activateStoryFrame("4")
console.log("toolbox01_a")
} else {
activateStoryFrame("1")
}
}
});
});
function activateStoryFrame(pageN){
if (pageN == "1"){
// window.location.reload();
stopStory();
$("#story-frame").removeClass("tour-inactive");
$("#story-frame").removeClass("tour");
$("#story-frame").addClass("startscreen");
$("#balloon-startscreen").attr('style',"display:'block'!important");
// $("#navi").attr('style',"display:'none'!important");
// // $("#einlPO1").css('display') = 'block'
// document.getElementById("einlP01").style.display = "block";
// document.getElementById("einlP02").style.display = "none";
// document.getElementById("tourstart-btn").style.display = "none";
// document.getElementById("iconlist").style.display = "none";
// document.getElementById("detAnleitung").style.display = "none";
// document.getElementById("einlP01").scrollIntoView();
// document.getElementById("back-btn").style.display = "none";
} else if(pageN == "2"){
// var button = document.getElementById("tourstart-btn");
// button.click();
Introshow();
setpositionVAR(false);
zoomto('IntroProj');
} else if(pageN == "3"){
// var button = document.getElementById("btn_intro02");
// button.click();
zoomto('ProjektePage');
Projektshow();
} else if(pageN == "4"){
// var button = document.getElementById("btn_expert");
// button.click();
removebuildings();
addcont('main_bock');
addcont('main_heatdem');
addcont('main_nordbstuff');
Expert();
setpositionVAR(false);
zoomto('Expertenmodus');
}
}
\ No newline at end of file
This diff is collapsed.
......@@ -515,6 +515,10 @@ div.tour-top-navi {
/* color: grey; */
/* padding: 12px 16px; */
/* font-size: 16px; */
position: absolute;
top: .25rem;
right: 2rem;
cursor: pointer;
float:right;
background-color:rgb(60, 60, 60);
......
Markdown is supported
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