Skip to content
This repository was archived by the owner on Nov 14, 2023. It is now read-only.

Commit 882b346

Browse files
bkimminichbkimminich
committed
Merge remote-tracking branch 'origin/master'
2 parents f920f1e + a6aa43c commit 882b346

11 files changed

Lines changed: 335 additions & 68 deletions

File tree

‎Participants/ticket-24h-owasp/Tiffany-Long.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ facebook :
1919
project-leader :
2020
chapter-leader :
2121
owasp-other :
22+
pre-summit : Sat, Sun
2223
status : empty
2324
ticket : 5x24h
2425
working-sessions:

‎Participants/ticket-24h/Tony-UV.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ twitter : t0nyuv
1313
facebook :
1414
status : need-content
1515
ticket : 5x24h
16+
pre-summit : Sun
1617
working-sessions:
1718
# add above a comma delimited list of the Working Sessions you would like to attend (use the session's title)
1819
---

‎pages/for-editors/lodges/mapping.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
layout : blocks/page-component
3+
component: editors/lodges/mapping.html
4+
title : Lodges / Mapping
5+
---

‎src/includes/editors/lodges/mapping.pug‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
.lodges
2+
.container
3+
h1 {{ page.title }}
4+
a(href='/pages/for-editors') Back to Editor's pages
5+
p Here are the participant's mappings (per Lodge)
6+
p Note that changes will be made to the Summit mappings since the current list was created alphabetically
7+
h2 Pre Summit
8+
.row
9+
| {% for lodge in site.data.mapped.lodges.pre_Summit%}
10+
.col-xs-4.col-sm-4
11+
.card.pre-summit-card
12+
table.table.table-striped
13+
thead
14+
th.text-center Lodge Number
15+
th.text-center Participant
16+
tbody
17+
| {% for participant in lodge[1] %}
18+
tr
19+
| {% if forloop.index == 1 %}
20+
td(rowspan='6')
21+
.lodge_Id {{ lodge[0] }}
22+
| {% endif %}
23+
td
24+
| {{ participant.name }}
25+
.when {{ participant.when }}
26+
| {% endfor %}
27+
| {% endfor %}
28+
29+
h2 Summit
30+
.row
31+
| {% for lodge in site.data.mapped.lodges.lodges%}
32+
.col-xs-4.col-sm-4
33+
34+
.card
35+
table.table.table-striped
36+
thead
37+
th.text-center Lodge Number
38+
th.text-center Participant
39+
tbody
40+
| {% for name in lodge[1].names %}
41+
tr
42+
| {% if forloop.index == 1 %}
43+
td(rowspan='6')
44+
.lodge_Id {{ lodge[1].id }}
45+
| {% endif %}
46+
td
47+
| {{ name}}
48+
| {% endfor %}
49+
| {% endfor %}

‎src/less/components/lodges.less‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
.lodges {
2+
h1 a { padding:20px;}
3+
4+
.pre-summit-card {
5+
min-height:390px !important;
6+
}
7+
.card {
8+
min-height:340px;
9+
10+
background-color: white;
11+
border: 1px solid;
12+
border-radius: 0.5em;
13+
border-color: #f2f2f2;
14+
margin-bottom: 20px;
15+
&:hover {
16+
background-color: #b4f6a4;
17+
.participant-name {
18+
color: white;
19+
}
20+
.participant-title {
21+
color: white;
22+
}
23+
}
24+
padding: 5px;
25+
}
26+
.lodge_Id {
27+
font-size: 30px;
28+
text-align: center;
29+
}
30+
table {
31+
th { color: #87BB40}
32+
td {
33+
vertical-align: middle !important;
34+
}
35+
}
36+
37+
.when {
38+
font-size: 10px
39+
}
40+
41+
//table {
42+
// border :1px solid;
43+
// padding: 5px;
44+
//}
45+
}
46+

‎src/server/build-data.coffee‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ using new jekyll_Data(), ->
1919
@.map_Schedule()
2020
@.participants.map_Lists()
2121
@.tickets.map_Tickets()
22+
@.tickets.map_Lodges()
2223
console.timeEnd(".... Build Data in");

‎src/server/src/Tickets.coffee‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,51 @@
22
class Tickets
33
constructor: (jekyll_Data)->
44
@.jekyll_Data = jekyll_Data
5+
@.file_Json_Lodges = @.jekyll_Data.folder_Data_Mapped.path_Combine 'lodges.json'
6+
@.file_Yaml_Lodges = @.jekyll_Data.folder_Data_Mapped.path_Combine 'lodges.yml'
57
@.file_Json_Tickets = @.jekyll_Data.folder_Data_Mapped.path_Combine 'tickets.json'
68
@.file_Yaml_Tickets = @.jekyll_Data.folder_Data_Mapped.path_Combine 'tickets.yml'
79

10+
11+
12+
map_Lodges: ->
13+
ids = ['OK413','OK414','OK415','OK416','OK426','OK427','OK428','OK309','OK310','OK312','OK313','OK314','OK315','OK316','OK319','OK320','OK321']
14+
data =
15+
ids : ids
16+
lodges : {}
17+
pre_Summit: {}
18+
19+
# Summit tickets
20+
tickets_Data = @.file_Json_Tickets.load_Json()
21+
need_Room = []
22+
for key,value of tickets_Data.by_Ticket
23+
if key.contains 'x24h'
24+
#console.log key + ':'
25+
need_Room = need_Room.concat value.names
26+
27+
while need_Room.size() >0
28+
id = ids.pop()
29+
data.lodges[id] =
30+
id : id
31+
names: need_Room.splice(0,6)
32+
33+
for id in ids
34+
data.lodges[id] =
35+
id : id
36+
names: []
37+
38+
# PreSummit
39+
names = []
40+
for key,value of @.jekyll_Data.participants_Data
41+
if value.metadata['pre-summit']
42+
names.add name: key, when: value.metadata['pre-summit']
43+
data.pre_Summit['OK314'] = names.splice(0,6)
44+
data.pre_Summit['OK315'] = names.splice(0,6)
45+
46+
console.log data.pre_Summit
47+
@.jekyll_Data.save_Data data, @.file_Json_Lodges, @.file_Yaml_Lodges
48+
return data
49+
850
map_Tickets: ->
951
data = {}
1052
data =
@@ -41,11 +83,8 @@ class Tickets
4183
'when-day' : value.metadata['when-day'] || ''
4284
data.by_Participant[regonline_Name] = mapping
4385

44-
#console.log data.by_Participant._keys()
4586
data.by_Participant = @.jekyll_Data.sort_By_Key data.by_Participant
46-
#console.log data.by_Participant._keys()
47-
#console.log data.json_Pretty()
48-
#console.log data.stats.no_regonline
87+
4988
@.jekyll_Data.save_Data data, @.file_Json_Tickets, @.file_Yaml_Tickets
5089
return data
5190

‎src/server/test/Tickets.test.coffee‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe 'Jekyll Data | Tickets', ->
1010
@.jekyll_Data.folder_Root.assert_Folder_Exists()
1111
@.file_Yaml_Tickets.file_Name().assert_Is 'tickets.yml'
1212

13-
it.only 'map_Tickets', ->
13+
it 'map_Tickets', ->
1414
using tickets, ->
1515
using @.map_Tickets(), ->
1616
# @.all_Participants.size().assert_Is_Bigger_Than 150
@@ -20,3 +20,10 @@ describe 'Jekyll Data | Tickets', ->
2020

2121
@.file_Json_Tickets.assert_File_Exists()
2222
@.file_Yaml_Tickets.assert_File_Exists()
23+
24+
it 'map_Lodges', ->
25+
using tickets, ->
26+
using @.map_Lodges(), ->
27+
28+
@.file_Json_Lodges.assert_File_Exists()
29+
@.file_Yaml_Lodges.assert_File_Exists()

‎website/_includes/editors/Lodges/list.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
<!--p {{ site.data.mapped.lodges }}-->
3+
4+
<div class="lodges">
5+
<div class="container">
6+
<h1>{{ page.title }}</h1>
7+
<div class="row">{% for lodge in site.data.mapped.lodges.lodges%}
8+
<div class="col-xs-4 col-sm-4">
9+
<div class="card">
10+
<table class="table table-striped">
11+
<thead>
12+
<th class="text-center">Lodge Number</th>
13+
<th class="text-center">Participant</th>
14+
</thead>
15+
<tbody>{% for name in lodge[1].names %}
16+
<tr>{% if forloop.index == 1 %}
17+
<td rowspan="6">
18+
<div class="lodge_Id">{{ lodge[1].id }}</div>
19+
</td>{% endif %}
20+
<td>{{ name}}</td>
21+
</tr>{% endfor %}
22+
</tbody>
23+
</table>
24+
</div>
25+
</div>{% endfor %}
26+
</div>
27+
</div>
28+
</div>

‎website/_includes/editors/Lodges/mapping.html‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
<div class="lodges">
3+
<div class="container">
4+
<h1>{{ page.title }}<a href="/pages/for-editors">Back to Editor's pages</a></h1>
5+
<p>Here are the participant's mappings (per Lodge)</p>
6+
<p>Note that changes will be made to the Summit mappings since the current list was created alphabetically</p>
7+
<h2>Pre Summit</h2>
8+
<div class="row">{% for lodge in site.data.mapped.lodges.pre_Summit%}
9+
<div class="col-xs-4 col-sm-4">
10+
<div class="card pre-summit-card">
11+
<table class="table table-striped">
12+
<thead>
13+
<th class="text-center">Lodge Number</th>
14+
<th class="text-center">Participant</th>
15+
</thead>
16+
<tbody>{% for participant in lodge[1] %}
17+
<tr>{% if forloop.index == 1 %}
18+
<td rowspan="6">
19+
<div class="lodge_Id">{{ lodge[0] }}</div>
20+
</td>{% endif %}
21+
<td>{{ participant.name }}
22+
<div class="when">{{ participant.when }}</div>
23+
</td>
24+
</tr>{% endfor %}
25+
</tbody>
26+
</table>
27+
</div>
28+
</div>{% endfor %}
29+
</div>
30+
<h2>Summit</h2>
31+
<div class="row">{% for lodge in site.data.mapped.lodges.lodges%}
32+
<div class="col-xs-4 col-sm-4">
33+
<div class="card">
34+
<table class="table table-striped">
35+
<thead>
36+
<th class="text-center">Lodge Number</th>
37+
<th class="text-center">Participant</th>
38+
</thead>
39+
<tbody>{% for name in lodge[1].names %}
40+
<tr>{% if forloop.index == 1 %}
41+
<td rowspan="6">
42+
<div class="lodge_Id">{{ lodge[1].id }}</div>
43+
</td>{% endif %}
44+
<td>{{ name}}</td>
45+
</tr>{% endfor %}
46+
</tbody>
47+
</table>
48+
</div>
49+
</div>{% endfor %}
50+
</div>
51+
</div>
52+
</div>

0 commit comments

Comments
 (0)