Skip to content

Commit

Permalink
add dropdown to select other churches
Browse files Browse the repository at this point in the history
  • Loading branch information
@kkuepper
kkuepper committed Feb 16, 2024
1 parent ce995e5 commit 6525a2f
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 52 deletions.
17 changes: 12 additions & 5 deletions client/app/scripts/controllers/statistics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,25 @@ angular.module('bmmApp')
) {
$scope.load = true;
$scope.data = null;
$scope.selectedChurch = null;

$(window).off('scrollBottom');

var load = function() {
_api.churchStatisticsGet($routeParams.secret).done(function (data) {
console.log("data", data);
var load = function(churchId) {
_api.churchStatisticsGet(churchId).done(function (data) {
console.log("loaded data", data);
$scope.data = data;
console.log("data", data);
$scope.load = false;
$scope.selectedChurch = {id: data.church_id, name: data.church};
});
};
load();
load("");

$scope.changeChurch = function(selected) {
console.log("test", selected);
$scope.load = true;
load(selected.id);
}

// This is a workaround to fix the scroll problem (#5317 in VSTS)
$scope.setMinHeight = function() {
Expand Down
116 changes: 71 additions & 45 deletions client/app/views/pages/statistics.html
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,79 @@

<div ng-show="!load">
<h3>Message to the Romans</h3>

<div ng-show="data.available_churches">
<select
ng-options="church as church.name for church in data.available_churches track by church.id"
ng-model="selectedChurch"
ng-change="changeChurch(selectedChurch)">

</select>
</div>

<h4>Statistikk for {{data.church_name}}</h4>

<table class="table-element">
<tr style="background-color: lightgrey">
<th></th>
<th ng-show="!data.limit_to_youth">U18</th>
<th ng-show="!data.limit_to_youth">19 - 25</th>
<th ng-show="!data.limit_to_youth">26 - 35</th>
<th>13 - 35</th>
</tr>
<tr style="color: #999">
<td>Har en personlig konto hos BMM</td>
<td ng-show="!data.limit_to_youth">{{data.has_bmm_account_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.has_bmm_account_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.has_bmm_account_percent26to35 | number : 1}}%</td>
<td>{{data.has_bmm_account_percent_youth | number : 1}}%</td>
</tr>
<tr>
<td>Hørt på minst 1 episode</td>
<td ng-show="!data.limit_to_youth">{{data.percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.percent26to35 | number : 1}}%</td>
<td>{{data.percent_youth | number : 1}}%</td>
</tr>
<tr>
<td>Hørt på alle episoder fra siste uken</td>
<td ng-show="!data.limit_to_youth">{{data.last_week_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.last_week_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.last_week_percent26to35 | number : 1}}%</td>
<td>{{data.last_week_percent_youth | number : 1}}%</td>
</tr>

<tr>
<td>Hørt på alle episoder fra og med 12. februar</td>
<td ng-show="!data.limit_to_youth">{{data.since_february12_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.since_february12_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.since_february12_percent26to35 | number : 1}}%</td>
<td>{{data.since_february12_percent_youth | number : 1}}%</td>
</tr>
<tr>
<td>Hørt på alle episoder så langt</td>
<td ng-show="!data.limit_to_youth">{{data.on_track_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.on_track_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.on_track_percent26to35 | number : 1}}%</td>
<td>{{data.on_track_percent_youth | number : 1}}%</td>
</tr>
</table>
<div>
<table class="table-element" style="width: auto">
<tr style="background-color: lightgrey">
<th></th>
<th ng-show="!data.limit_to_youth">U18</th>
<th ng-show="!data.limit_to_youth">19 - 25</th>
<th ng-show="!data.limit_to_youth">26 - 35</th>
<th>13 - 35</th>
</tr>
<tr style="color: #999">
<td>Har brukt BMM-appen siden september (verify)</td>
<td ng-show="!data.limit_to_youth">{{data.has_bmm_account_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.has_bmm_account_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.has_bmm_account_percent26to35 | number : 1}}%</td>
<td>{{data.has_bmm_account_percent_youth | number : 1}}%</td>
</tr>
<tr>
<td>Hørt på minst 1 episode</td>
<td ng-show="!data.limit_to_youth">{{data.percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.percent26to35 | number : 1}}%</td>
<td>{{data.percent_youth | number : 1}}%</td>
</tr>
<tr>
<td>Hørt på alle episoder fra forrige uken</td>
<td ng-show="!data.limit_to_youth">{{data.last_week_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.last_week_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.last_week_percent26to35 | number : 1}}%</td>
<td>{{data.last_week_percent_youth | number : 1}}%</td>
</tr>

<tr>
<td>Hørt på alle episoder fra og med 12. februar</td>
<td ng-show="!data.limit_to_youth">{{data.since_february12_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.since_february12_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.since_february12_percent26to35 | number : 1}}%</td>
<td>{{data.since_february12_percent_youth | number : 1}}%</td>
</tr>
<tr>
<td>Hørt på alle episoder så langt</td>
<td ng-show="!data.limit_to_youth">{{data.on_track_percent_u18 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.on_track_percent19to25 | number : 1}}%</td>
<td ng-show="!data.limit_to_youth">{{data.on_track_percent26to35 | number : 1}}%</td>
<td>{{data.on_track_percent_youth | number : 1}}%</td>
</tr>
</table>


<div style="margin-top: 8px">
<p>
Tilgangen til denne statistikken er kun ment for lokale ungdomsledere og BUK-kontakter. Disse dataene inneholder informasjon om individuell deltagelse i bibelstudieprosjektet, og det er derfor viktig at de ikke deles fritt med andre. Bruk denne statistikken ansvarlig for å skape positivt engasjement rundt prosjektet i din lokalforening.
Dersom du har spørsmål til hvordan tallene kan brukes, vennligst kontakt oss på <a href="mailto:support@bcc.media">support@bcc.media</a>.
</p>
<p>
Alderskategoriene er basert på fødselsår. Det betyr at hvis du fyller 19 i år, regnes du med i kategorien 19-25.
Alderskategoriene er basert på personlige brukerkontoer, og brukere som f.eks. låner foreldres innlogging vil ikke telle med i statistikken for sin aldersgruppe.
</p>
</div>
<br/>
</div>


</div>

Expand Down
4 changes: 2 additions & 2 deletions common/app/scripts/services/_api.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1054,10 +1054,10 @@ angular.module('bmmLibApp')
})
};

factory.churchStatisticsGet = function() {
factory.churchStatisticsGet = function(churchId) {
return factory.addToQueue({
method: 'GET',
url: serverUrl + 'statistics/project/church/'
url: serverUrl + 'statistics/project/church/' + churchId
})
};

Expand Down

0 comments on commit 6525a2f

Please sign in to comment.