Skip to content

Commit

Permalink
Updates parser. Updates tests (patch)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zrrrzzt
zrrrzzt committed Sep 21, 2018
1 parent 913d380 commit 3665b39
Show file tree
Hide file tree
Showing 7 changed files with 202 additions and 135 deletions.
2 changes: 1 addition & 1 deletion lib/parse-boards.js
View file
Expand Up @@ -6,7 +6,7 @@ module.exports = (page) => {

boards.each((index, elem) => {
let item = {}
item.name = $('div.boardName > h3', elem).text().trim()
item.name = $('div.boardName > span', elem).text().trim()
item.id = $('a', elem)[0].attribs.href.split('/').pop()
list.push(item)
})
Expand Down
32 changes: 22 additions & 10 deletions test/data/get-boards-data.json
View file
Expand Up @@ -103,6 +103,14 @@
"name": "Partssammensatt utvalg",
"id": "236946"
},
{
"name": "Råd for frivillige",
"id": "239126"
},
{
"name": "Synfaringsutvalet",
"id": "239069"
},
{
"name": "Telemark fylkeskommunale eldreråd",
"id": "217344"
Expand All @@ -120,16 +128,16 @@
"id": "200175"
},
{
"name": "Telemark fylkeskommunale klagenemnda for skolesaker",
"name": "Telemark fylkeskommunale klagenemnd for skolesaker",
"id": "217341"
},
{
"name": "Telemark interkommunale næringsfond",
"id": "208883"
"id": "222101"
},
{
"name": "Telemark interkommunale næringsfond",
"id": "222101"
"name": "Telemark interkommunale næringsfond 2014-2015",
"id": "208883"
},
{
"name": "Telemark kontrollutval",
Expand All @@ -140,23 +148,27 @@
"id": "231335"
},
{
"name": "Temakomite eierskap",
"name": "Temakomité for kultur, idrett og folkehelse",
"id": "238523"
},
{
"name": "Temakomité eierskap",
"id": "238072"
},
{
"name": "Temakomite kompetanse 1",
"name": "Temakomitè kompetanse 1",
"id": "238071"
},
{
"name": "Temakomite organisering av kollektivtrafikk",
"name": "Temakomité organisering av kollektivtrafikk",
"id": "238070"
},
{
"name": "Temakomite politisk organisering",
"name": "Temakomité politisk organisering",
"id": "238073"
},
{
"name": "Temakomite samfunnsutviklerrollen",
"name": "Temakomité samfunnsutviklerrollen",
"id": "238065"
},
{
Expand All @@ -167,4 +179,4 @@
"name": "Yrkesopplæringsnemnda 2012 - 2015",
"id": "200176"
}
]
]
153 changes: 97 additions & 56 deletions test/data/get-boards-page.html
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/data/get-meetings-data-full.json
View file
Expand Up @@ -25,8 +25,8 @@
"month": "06",
"year": "2018",
"yearMonthDay": 20180605,
"status": "Ikke publisert",
"id": ""
"status": "Publisert",
"id": "627173"
},
{
"date": "24.10.2018",
Expand Down
8 changes: 4 additions & 4 deletions test/data/get-meetings-data.json
View file
Expand Up @@ -16,17 +16,17 @@
"month": "04",
"year": "2018",
"yearMonthDay": "20180424",
"status": "Ikke publisert",
"id": ""
"status": "Publisert",
"id": "627172"
},
{
"date": "05.06.2018",
"day": "05",
"month": "06",
"year": "2018",
"yearMonthDay": "20180605",
"status": "Ikke publisert",
"id": ""
"status": "Publisert",
"id": "627173"
},
{
"date": "24.10.2018",
Expand Down
136 changes: 75 additions & 61 deletions test/data/get-meetings-page.html
View file
@@ -1,3 +1,4 @@

<!DOCTYPE html>
<html lang="nb-NO">
<head>
Expand Down Expand Up @@ -242,7 +243,7 @@
$("#searchResultMeeting").html(instructionLabel + " m&#248;ter funnet");
}
else {
$("#searchResultMeeting").html("Ingen m&#248;ter funnet");
$("#searchResultMeeting").html("Ingen m&#248;ter er gjort tilgjengelig for denne perioden.");
}
$('#viewMoreMeetings').css('display', 'none');
}
Expand All @@ -267,7 +268,7 @@
SetMeetingsHtml(data);
var instructionLabel = $(data).find('li').length;
if (instructionLabel !== 0) {
$("#instructionLabel").html(instructionLabel + " m&#248;ter funnet for " + $("#ulMonths option:selected").text() + " " + $("#ulYear option:selected").text());
$("#instructionLabel").html(instructionLabel + " m&#248;ter er gjort tilgjengelig for " + $("#ulMonths option:selected").text() + " " + $("#ulYear option:selected").text());
$(".meetingsHeader img").css('display', 'block');
$(".homePageSelectedDateString").css('display', 'block');
}
Expand All @@ -286,7 +287,9 @@
<body>
<div id="loader"></div>
<div class="">

<div id="skip">
<a href="#content">G&#229; til hovedinnhold</a>
</div>
<div class="headerSection" style="background-color: #fff">
<div class="containerFluid">
<header class="header">
Expand All @@ -301,8 +304,9 @@ <h1>Politiske m&#248;ter</h1>
</div>
<div class="siteSearch">
<div class="searchForm">
<span id="searchInputLabel">S&#248;k</span>
<input id="q" name="q" type="text" placeholder="S&#248;k" class="siteSearchField" tabindex="0" title="S&#248;k" />
<button id="searchButton" class="searchButton" tabindex="0" style="background-color: #62b3e5; border-color: #62b3e5" aria-label="S&#248;k">
<button id="searchButton" class="searchButton" tabindex="0" style="background-color: #62b3e5; border-color: #62b3e5" aria-labelledby="searchInputLabel">
<img src="/Areas/Meetings/Content/Images/search.png" alt="Klikk her for &#229; s&#248;ke" aria-hidden="true"/>
</button>
</div>
Expand All @@ -321,6 +325,8 @@ <h1>Politiske m&#248;ter</h1>
</ul>
</div>

<h1></h1>



<div class="goBackSection boardsPage">
Expand All @@ -333,7 +339,7 @@ <h1>Politiske m&#248;ter</h1>
</button>
</div>

<div class="meetingTitle">
<div class="meetingTitle" id="content">
<div class="meetingsHeaderSec">
<div class="meetingTitleIcon">
<img class="images" src="/Areas/Meetings/Content/Images/Board.png" alt="">
Expand All @@ -355,7 +361,7 @@ <h2>Finn m&#248;ter - Fylkestinget</h2>
<div class="meetingsContainer">
<div class="selectYear">
<label class="instructionLabel" for="boardsYearSelection">&#197;r</label>
<select class="dropdown" id="boardsYearSelection" onchange="OnBoardSelectionChange('/Meetings/tfk/Boards/Details/216162')" tabindex="0">
<select class="dropdown" id="boardsYearSelection" tabindex="0">
<option selected>2018</option>
<option>2017</option>
<option>2016</option>
Expand All @@ -364,7 +370,7 @@ <h2>Finn m&#248;ter - Fylkestinget</h2>
</div>
<div class="selectMonth">
<label class="instructionLabel" for="boardsSelectionMonth">M&#229;ned</label>
<select class="dropdown" id="boardsSelectionMonth" onchange="OnBoardSelectionChange('/Meetings/tfk/Boards/Details/216162')" tabindex="0">
<select class="dropdown" id="boardsSelectionMonth" tabindex="0">

<option value="-1" selected>Alle</option>
<option value="1">januar</option>
Expand All @@ -383,61 +389,70 @@ <h2>Finn m&#248;ter - Fylkestinget</h2>
</select>
</div>
<div class="selectedDate">
<p class="instructionLabel" id="instructionLabel">5 m&#248;ter funnet for 2018</p>
</div>
<button id="filterBtn" class="filterButton" tabindex="0" onclick="OnBoardSelectionChange('/Meetings/tfk/Boards/Details/216162')">
<span>Bruk filter</span>
</button>
</div>
</div>
<div class="displaySearchResult boardDetailPage">
<p class="instructionLabel" id="instructionLabel">5 m&#248;ter funnet for 2018</p>
</div>
<div class="meetingList">
<ul>
<li class="boardLink">
<a href="/Meetings/tfk/Meetings/Details/644324">
<div class="meetingList">
<ul>
<li class="boardLink">
<a href="/Meetings/tfk/Meetings/Details/644324">
<div class="meetingName">
<span>Fylkestinget (05.03.2018)</span>
</div>
<div class="meetingDate">
<span>05.03.2018</span>
<span>00:00</span>
</div>
</a>
</li>
<li class="boardLink">
<a href="/Meetings/tfk/Meetings/Details/627172">
<div class="meetingName">
<span>Fylkestinget (24.04.2018)</span>
</div>
<div class="meetingDate">
<span>24.04.2018</span>
<span>13:00</span>
</div>
</a>
</li>
<li class="boardLink">
<a href="/Meetings/tfk/Meetings/Details/627173">
<div class="meetingName">
<span>Fylkestinget (05.06.2018)</span>
</div>
<div class="meetingDate">
<span>05.06.2018</span>
<span>13:00</span>
</div>
</a>
</li>
<li title="Under forberedelse" class="boardLink unpublishedMeeting">
<div class="meetingName">
<h3>Fylkestinget (05.03.2018)</h3>
<span>Fylkestinget (24.10.2018)</span>
</div>
<div class="meetingDate">
<span>05.03.2018</span>
<span>00:00</span>
<span>24.10.2018</span>
<span>Ikke publisert</span>
</div>
</a>
</li>
<li title="Under forberedelse" class="boardLink unpublishedMeeting">
<div class="meetingName">
<h3>Fylkestinget (24.04.2018)</h3>
</div>
<div class="meetingDate">
<span>24.04.2018</span>
<span>Ikke publisert</span>
</div>
</li>
<li title="Under forberedelse" class="boardLink unpublishedMeeting">
<div class="meetingName">
<h3>Fylkestinget (05.06.2018)</h3>
</div>
<div class="meetingDate">
<span>05.06.2018</span>
<span>Ikke publisert</span>
</div>
</li>
<li title="Under forberedelse" class="boardLink unpublishedMeeting">
<div class="meetingName">
<h3>Fylkestinget (24.10.2018)</h3>
</div>
<div class="meetingDate">
<span>24.10.2018</span>
<span>Ikke publisert</span>
</div>
</li>
<li title="Under forberedelse" class="boardLink unpublishedMeeting">
<div class="meetingName">
<h3>Fylkestinget (05.12.2018)</h3>
</div>
<div class="meetingDate">
<span>05.12.2018</span>
<span>Ikke publisert</span>
</div>
</li>
</ul>
</div>
</div>
</li>
<li title="Under forberedelse" class="boardLink unpublishedMeeting">
<div class="meetingName">
<span>Fylkestinget (05.12.2018)</span>
</div>
<div class="meetingDate">
<span>05.12.2018</span>
<span>Ikke publisert</span>
</div>
</li>
</ul>
</div>
</div>
</section>


Expand Down Expand Up @@ -704,7 +719,7 @@ <h3>Stine Margrethe Knutsdatter Olsen</h3>
<h3>Erling Dahl</h3>
</div>
<div class="memberDesignation">
<p>Fremskrittspartiet - Varamedlem i utvalg</p>
<p>Uavhengig - Varamedlem i utvalg</p>
</div>
</li>
<li class="memberListItem">
Expand Down Expand Up @@ -1313,10 +1328,9 @@ <h3>Evy-Anni Evensen</h3>

</div>
</aside>
<div class="bannerImage">
<img src="/Areas/Meetings/Content/Images/meetings-bg.jpg" alt="Omr&#229;debanner" />
<div class="bannerImage">
<img src="https://si360opengov.blob.core.windows.net/d19582c7-a8fb-4a7a-954f-cb4fb31ce2dd/TFK.jpg" alt="Omr&#229;debanner" />
</div>

<footer class="footer">
<p>
&nbsp;&nbsp;Fylkesbakken 10 Postboks 2844, Skien, 3702 | <a href="http://www.telemark.no/" target="_blank">www.telemark.no</a> | Tel: +47 35 91 70 00 | e-post: <a href="mailto: post@t-fk.no ">post@t-fk.no</a>
Expand Down
2 changes: 1 addition & 1 deletion test/get-boards-test.js
View file
Expand Up @@ -61,7 +61,7 @@ tap.test('It returns expected results', test => {
const expectedResult = require('./data/get-boards-data.json')
return getBoards(options)
.then(data => {
tap.equal(JSON.stringify(expectedResult), JSON.stringify(data), 'Returned agenda OK')
tap.equal(JSON.stringify(expectedResult), JSON.stringify(data), 'Returned boards OK')
test.done()
})
.catch(error => {
Expand Down

0 comments on commit 3665b39

Please sign in to comment.