Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Commit 38869b8

Browse files
tdeschampstdeschamps
committed
add colors for lines
1 parent 43ce3c7 commit 38869b8

14 files changed

+346
-50
lines changed

‎app/index.html

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,45 @@ <h2 class="text-center"> Construire votre requête Siri</h2>
9797
<form class="form-horizontal" id ="canned-requests">
9898
<fieldset>
9999
<legend>Requête préenregistrées</legend>
100+
<div class="form-group" id = "siriGeneralVersionAPI"">
101+
<label for="siriGeneralVersionAPI" class="col-sm-4 control-label">Version Siri
102+
</label>
103+
<div class = "col-sm-8">
104+
<label class="radio-inline">
105+
<input type="radio" name="siriVersionAPIOptions" id="siriGeneralVersionAPI1" value="1.3" checked = "checked"> 1.3
106+
</label>
107+
<label class="radio-inline">
108+
<input type="radio" name="siriVersionAPIOptions" id="siriGeneralVersionAPI2" value="1.4"> 1.4
109+
</label>
110+
<label class="radio-inline">
111+
<input type="radio" name="siriVersionAPIOptions" id="siriGeneralVersionAPI3" value="2.0"> 2.0
112+
</label>
113+
</div>
114+
</div>
115+
<div class="form-group hidden" id = "requestorNameWrapper">
116+
<label for="requestorName" class="col-lg-4 control-label">Identifiant</label>
117+
<div class="col-lg-8">
118+
<input type="text" class="form-control" id="requestorName" placeholder="Nom du demandeur">
119+
</div>
120+
</div>
121+
<div class="form-group hidden" id = "requestorVersionWrapper">
122+
<label for="requestorVersion" class="col-lg-4 control-label">Version</label>
123+
<div class="col-lg-8">
124+
<input type="text" class="form-control" id="requestorVersion" placeholder="Version du demandeur">
125+
</div>
126+
</div>
127+
<div class="form-group hidden" id = "destinationRefWrapper">
128+
<label for="destinationRef" class="col-lg-4 control-label">Destinations</label>
129+
<div class="col-lg-8">
130+
<input type="text" class="form-control" id="destinationRef" placeholder="destinations">
131+
</div>
132+
</div>
133+
<div class="form-group hidden" id = "groupOfLinesRefWrapper">
134+
<label for="groupOfLinesRef" class="col-lg-4 control-label">Réseaux et groupes de lignes</label>
135+
<div class="col-lg-8">
136+
<input type="text" class="form-control" id="groupOfLinesRef" placeholder="réseaux et groupes de lignes">
137+
</div>
138+
</div>
100139
<div class="form-group">
101140
<div class="col-xs-4">
102141
<button type="button" class="btn btn-primary" id="stop-discovery">Stop Discovery</button>
@@ -138,9 +177,15 @@ <h2 class="text-center"> Construire votre requête Siri</h2>
138177
<div class="form-group hidden" id = "requestorVersionWrapper">
139178
<label for="requestorVersion" class="col-lg-4 control-label">Version</label>
140179
<div class="col-lg-8">
141-
<input type="text" class="form-control" id="requestorVersion" placeholder="Nom du demandeur">
180+
<input type="text" class="form-control" id="requestorVersion" placeholder="Version du demandeur">
142181
</div>
143182
</div>
183+
<div class="form-group hidden" id="minimumStopVisitPerLineViaWrapper">
184+
<label for="minimumStopVisitPerLineVia" class="col-lg-4 control-label">Minimum de passages par itinéraire</label>
185+
<div class="col-lg-8">
186+
<input type="text" class="form-control" id="minimumStopVisitPerLineVia" placeholder="Minimum de passages par itinéraire">
187+
</div>
188+
</div>
144189
<div class="form-group">
145190
<label for="stopName" class="col-lg-4 control-label">Nom arrêt</label>
146191
<div class="col-lg-8">
@@ -214,8 +259,8 @@ <h2 class="text-center"> Construire votre requête Siri</h2>
214259
<div class="form-group">
215260
<label for="minStLine" class="col-lg-4 control-label">MinStLine</label>
216261
<div class="col-lg-8">
217-
<input type="text" class="form-control" id="minStLine" list="time-span-list" placeholder="Nombre d'arrets mini par ligne">
218-
<datalist id="time-span-list">
262+
<input type="text" class="form-control" id="minStLine" list="minStLine-list" placeholder="Nombre d'arrets mini par ligne">
263+
<datalist id="minStLine-list">
219264
<option>1</option>
220265
<option>2</option>
221266
<option>3</option>
@@ -239,7 +284,7 @@ <h2 class="text-center"> Construire votre requête Siri</h2>
239284
<p class="col-lg-4">passages suivants
240285
</div>
241286
<div class="form-group">
242-
<div class="col-xs-12 text-center">
287+
<div class="col-xs-12 col-sm-6 col-lg-4 text-center">
243288
<button type="submit" class="btn btn-success">Envoyer la requête</button>
244289
</div>
245290
</div>
@@ -253,7 +298,7 @@ <h2 class= "text-center">Tester votre requête xml</h2>
253298
<textarea class = "form-control xml-paste-zone" id="xml-request-textarea" placeholder = "Copier votre requête xml"></textarea>
254299
</div>
255300
<div class="form-group">
256-
<div class="col-lg-8 col-lg-offset-4">
301+
<div class="col xs-12 col-sm-6 col-lg-4">
257302
<button type="button" class="btn btn-success" id="smart-request-submit">Envoyer la requête</button>
258303
</div>
259304
</div>

‎app/scripts/AjaxRequestSender.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010

1111
var request = new stopMonitoringRequest;
12-
var xmlRequest = request.getStopMonitoring('form');
12+
var xmlRequest = request.getStopMonitoring('#stop-monitoring');
1313
var responseCard = new stopMonitoringCard;
1414
console.log(xmlRequest)
1515
request.sendRequest(xmlRequest, request.handleStopMonitoringResponse, responseCard);
@@ -19,7 +19,7 @@
1919
$("#response > .panel").remove()
2020
var request = new stopMonitoringRequest;
2121
var responseCard = new stopMonitoringCard;
22-
var generalMessageRequest = request.getGeneralMessage();
22+
var generalMessageRequest = request.getGeneralMessage('#canned-requests');
2323
request.sendRequest(generalMessageRequest, request.handleGeneralMessageResponse, responseCard);
2424
});
2525

‎app/scripts/main.js

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,35 @@ $(document).ready( function() {
3030
});
3131
});
3232

33-
$('#siriVersionAPI3').on('click', function() {
34-
if ($('#requestorNameWrapper').hasClass('hidden')) {
35-
$('#requestorNameWrapper').removeClass('hidden');
36-
};
37-
38-
if ($('#requestorVersionWrapper').hasClass('hidden')) {
39-
$('#requestorVersionWrapper').removeClass('hidden');
40-
};
33+
$('#siriVersionAPI3, #siriGeneralVersionAPI3').on('click', function() {
34+
var hiddenFields = []
35+
hiddenFields = $(this).parentsUntil('.form-horizontal').find('.hidden')
36+
hiddenFields.each(function(index, elt) {
37+
$(elt).removeClass('hidden');
38+
});
4139
});
4240

43-
$('#siriVersionAPI2, #siriVersionAPI1').on('click', function() {
41+
$('#siriVersionAPI2, #siriVersionAPI1, #siriGeneralVersionAPI2, #siriGeneralVersionAPI1').on('click', function() {
4442

45-
if ($('#requestorNameWrapper').hasClass('hidden') == false) {
46-
$('#requestorNameWrapper').addClass('hidden');
47-
};
43+
var nodeName = $(this).parentsUntil('.form-horizontal').find('#requestorNameWrapper')
44+
var nodeVersion = $(this).parentsUntil('.form-horizontal').find('#requestorVersionWrapper')
45+
var hiddenArray = [nodeName, nodeVersion];
4846

49-
if ($('#requestorVersionWrapper').hasClass('hidden') == false) {
50-
$('#requestorVersionWrapper').addClass('hidden');
47+
if ($(this).prop('id') == "siriGeneralVersionAPI1" || $(this).prop('id') == "siriGeneralVersionAPI2") {
48+
var nodeDestinationRef = $(this).parentsUntil('.form-horizontal').find('#destinationRefWrapper')
49+
var nodeGroupDestination = $(this).parentsUntil('.form-horizontal').find('#groupOfLinesRefWrapper')
50+
hiddenArray = hiddenArray.concat([nodeDestinationRef, nodeGroupDestination]);
51+
} else {
52+
var nodeMinimumStopVisitPerLine = $(this).parentsUntil('.form-horizontal').find('#minimumStopVisitPerLineViaWrapper')
53+
hiddenArray = hiddenArray.concat([nodeMinimumStopVisitPerLine]);
5154
};
52-
})
55+
56+
hiddenArray.forEach(function(elt) {
57+
if (elt.hasClass('hidden') == false) {
58+
elt.addClass('hidden');
59+
}
60+
});
61+
62+
});
63+
5364
});

‎app/scripts/stopMonitoringCard.coffee

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class stopMonitoringCard
2121

2222

2323
stopMonitoringTemplate: """
24-
<div class = "panel panel-default stop-wrapper">
24+
<div class = "panel panel-default stop-wrapper {{lineColor}}">
2525
<div class = "panel-heading">
2626
<div class = "stop-name"></div>
2727
<h4>{{monitoredCall.StopPointName}}</h4>
@@ -62,7 +62,7 @@ class stopMonitoringCard
6262
</div>"""
6363

6464
stopDiscoveryTemplate: """
65-
<div class = "panel panel-default stop-wrapper">
65+
<div class = "panel panel-default stop-wrapper {{lineColor}}">
6666
<div class = "panel-heading">
6767
<div class = "stop-name"></div>
6868
<h4>{{stopDiscovery.StopName}}</h4>
@@ -81,7 +81,7 @@ class stopMonitoringCard
8181
</div>"""
8282

8383
lineDiscoveryTemplate: """
84-
<div class = "panel panel-default stop-wrapper">
84+
<div class = "panel panel-default stop-wrapper {{lineColor}}">
8585
<div class = "panel-heading">
8686
<div class = "stop-name"></div>
8787
<h4>{{lineDiscovery.LineName}}</h4>
@@ -99,6 +99,16 @@ class stopMonitoringCard
9999
</div>
100100
</div>"""
101101

102+
lineColors: {
103+
"NINOXE:Line:15625451:LOC": "line-4",
104+
"NINOXE:Line:15624980:LOC": "line-6-yellow",
105+
"NINOXE:Line:15626053:LOC": "line-5-magenta",
106+
"NINOXE:Line:15577792:LOC": "line-3-metro",
107+
"NINOXE:Line:15574334:LOC": "line-1-blue",
108+
"NINOXE:Line:15568799:LOC": "line-2-green",
109+
"NINOXE:Line:15627090:LOC": "line-7-orange"
110+
111+
}
102112

103113
parseSiriResponse: (node) ->
104114
@stopMonitoredVisit = {}
@@ -189,6 +199,16 @@ class stopMonitoringCard
189199
else
190200
object
191201
object
202+
lineColor:() ->
203+
204+
if @stopMonitoredVisit.LineRef
205+
line = @stopMonitoredVisit.LineRef
206+
else if @stopDiscovery.LineRef
207+
line = @stopDiscovery.LineRef
208+
else if @lineDiscovery.LineRef
209+
line = @lineDiscovery.LineRef
210+
211+
@lineColors[line]
192212

193213
buildMustacheStopCard:() ->
194214
for k,v of @stopMonitoredVisit

‎app/scripts/stopMonitoringCard.js

Lines changed: 25 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/scripts/stopMonitoringRequest.coffee

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ class stopMonitoringRequest
1313
lineId: null
1414
requestorVersion: null
1515
requestorName:null
16+
minimumStopVisitPerLineVia: null
17+
groupOfLinesRef: null
18+
destinationRef: null
1619

1720
requestTemplate: """<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
1821
<SOAP-ENV:Header/>
@@ -36,18 +39,21 @@ class stopMonitoringRequest
3639
{{#lineId}}
3740
<ns2:LineRef>{{lineId}}</ns2:LineRef>
3841
{{/lineId}}
39-
{{#destId}}
40-
<ns2:DestinationRef>{{destId}}</ns2:DestinationRef>
41-
{{/destId}}
42+
{{#destinationRef}}
43+
<ns2:DestinationRef>{{destinationRef}}</ns2:DestinationRef>
44+
{{/destinationRef}}
4245
{{#typeVisit}}
4346
<ns2:StopVisitTypes>{{typeVisit}}</ns2:StopVisitTypes>
4447
{{/typeVisit}}
4548
{{#maxStop}}
4649
<ns2:MaximumStopVisits>{{maxStop}}</ns2:MaximumStopVisits>
4750
{{/maxStop}}
48-
{{#minStLine}}
49-
<ns2:MinimumStopVisitsPerLine>{{minStLine}}</ns2:MinimumStopVisitsPerLine>
50-
{{/minStLine}}
51+
{{#minStLine}}
52+
<ns2:MinimumStopVisitsPerLine>{{minStLine}}</ns2:MinimumStopVisitsPerLine>
53+
{{/minStLine}}
54+
{{#minimumStopVisitPerLineVia}}
55+
<ns2:MinimumStopVisitsPerLineVia>{{minimumStopVisitPerLineVia}}</ns2:MinimumStopVisitsPerLineVia>
56+
{{/minimumStopVisitPerLineVia}}
5157
{{#onward}}
5258
<ns2:MaximumNumberOfCalls>
5359
<ns2:Onwards>{{onward}}</ns2:Onwards>
@@ -99,9 +105,15 @@ class stopMonitoringRequest
99105
<ns2:RequestorRef>Siri-client</ns2:RequestorRef>
100106
<ns2:MessageIdentifier>GeneralMessage:Test:0</ns2:MessageIdentifier>
101107
</ServiceRequestInfo>
102-
<Request version="1.3">
108+
<Request version="{{siriVersion}}">
103109
<ns2:RequestTimestamp>{{requestDate}}</ns2:RequestTimestamp>
104110
<ns2:MessageIdentifier>GeneralMessage:Test:0</ns2:MessageIdentifier>
111+
{{#destinationRef}}
112+
<ns2:DestinationRef>{{destinationRef}}</ns2:DestinationRef>
113+
{{/destinationRef}}
114+
{{#groupOfLinesRef}}
115+
<ns2:GroupOfLinesRef>{{groupOfLinesRef}}</ns2:GroupOfLinesRef>
116+
{{/groupOfLinesRef}}
105117
</Request>
106118
<RequestExtension xmlns=""/>
107119
</ns7:GetGeneralMessage>
@@ -143,7 +155,9 @@ class stopMonitoringRequest
143155
"minStLine",
144156
"onward",
145157
"requestorVersion",
146-
"requestorName"]
158+
"requestorName",
159+
"destinationRef",
160+
"groupOfLinesRef"];
147161

148162
form = $(el)
149163
this.siriVersionAPI = form.find('input[name="siriVersionAPIOptions"]:checked').val()
@@ -180,6 +194,7 @@ class stopMonitoringRequest
180194
Mustache.render(template, this)
181195

182196
getStopDiscovery:() ->
197+
183198
template = @stopDiscoveryTemplate
184199
Mustache.parse template
185200
Mustache.render(template, this)
@@ -189,7 +204,8 @@ class stopMonitoringRequest
189204
Mustache.parse template
190205
Mustache.render(template, this)
191206

192-
getGeneralMessage:() ->
207+
getGeneralMessage:(form) ->
208+
this.parseForm(form)
193209
template = @generalMessageTemplate
194210
Mustache.parse template
195211
Mustache.render(template, this)
@@ -242,9 +258,14 @@ class stopMonitoringRequest
242258
$('#xml-response-wrapper').val(xmlText)
243259

244260
sendRequest:(xmlRequest, responseHandler, handler) ->
261+
if @siriVersionAPI == "2.0"
262+
serverUrl = "urlSiriV2"
263+
else
264+
serverUrl = 'http://appli.chouette.mobi/irys_server'
265+
245266
$.ajax(
246267
method: 'POST'
247-
url: 'http://appli.chouette.mobi/irys_server'
268+
url: serverUrl
248269
context: document.body
249270
crossDomain: true
250271
contentType: 'text/xml'

0 commit comments

Comments
 (0)