Skip to content

[ISDK-84] Ranking service #44

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2a8fb74
Move assessment and submission [ISDK-75]
imkven Oct 2, 2017
e4a11c0
Fix render error problem [ISDK-75]
imkven Oct 2, 2017
4d80266
Fix problem unable to submit [ISDK-75]
imkven Oct 2, 2017
435a0a5
Changing declared classes (WIP) [ISDK-75]
imkven Oct 2, 2017
681bc28
Update code standard (WIP) [ISDK-75]
imkven Oct 2, 2017
8cf28ac
Update to standard code [ISDK-75]
imkven Oct 2, 2017
a5fda7d
Update assessment code [ISDK-75]
imkven Oct 3, 2017
af61d9f
Merge branch 'develop' into feature/ISDK-75/assessment-submission-api
imkven Oct 4, 2017
49159b9
Merge branch 'develop' into feature/ISDK-75/assessment-submission-api
imkven Oct 17, 2017
9a67dec
Merge branch 'develop' into bugfix/ISDK-77/Clean-up
imkven Oct 23, 2017
1abfd53
Initial app-config module [ISDK-80]
imkven Oct 23, 2017
3779d1b
Assign page to tab automatically [ISDK-80]
imkven Oct 23, 2017
b46086e
Add more page map [ISDK-80]
imkven Oct 23, 2017
2c47fbe
Update code style [ISDK-80]
imkven Oct 24, 2017
f1e720a
Merge branch 'develop' into feature/ISDK-80/modularisation
imkven Oct 24, 2017
02b1c10
Add comment for code [ISDK-80]
imkven Oct 24, 2017
0f7e753
Fix conflict (WIP)
imkven Oct 25, 2017
755f387
Merge branch 'feature/ISDK-75/assessment-submission-api' into feature…
imkven Oct 26, 2017
03700d3
Update code style [ISDK-80]
imkven Oct 26, 2017
9fb2782
Add "hide name" to settings page [ISDK-84]
imkven Oct 30, 2017
ae838ee
Allow trigger hide name in setting [ISDK-84]
imkven Oct 30, 2017
f8c6baa
Remove unused import [ISDK-84]
imkven Oct 30, 2017
550c5c6
Remove useless setting for ranking [ISDK-84]
imkven Nov 1, 2017
4197b6f
Merge branch 'develop' into feature/ISDK-84/ranking-service
imkven Nov 2, 2017
f9a451a
Remove ranking setting page [ISDK-84]
imkven Nov 2, 2017
c471516
Merge branch 'develop' into feature/ISDK-80/modularisation
imkven Nov 6, 2017
168a933
Support load tabs from remote config [ISDK-80]
imkven Nov 6, 2017
17be532
Merge branch 'feature/ISDK-80/modularisation' into feature/ISDK-84/ra…
imkven Nov 6, 2017
403ece9
Merge branch 'develop' into feature/ISDK-84/ranking-service
imkven Nov 7, 2017
7816a67
Fix keep changing of toggle button [ISDK-84]
imkven Nov 7, 2017
c3e726e
Remove useless code [ISDK-84]
imkven Nov 8, 2017
34bd846
Content-type is not form format [ISDK-84]
imkven Nov 9, 2017
55fd525
Merge branch 'develop' into feature/ISDK-84/ranking-service
imkven Nov 9, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { HttpClientModule, HttpClient } from '@angular/common/http';
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
import { TranslateHttpLoader } from "@ngx-translate/http-loader";
import { i18nData } from './assets/i18n-en';
import { AppConfigModule } from '../shared/app-config/app-config.module';
import { TranslationModule } from '../shared/translation/translation.module';
import { MomentModule } from 'angular2-moment';
import { WindowRef } from '../shared/window';
Expand Down Expand Up @@ -65,9 +66,8 @@ import { EventsListPage } from '../pages/events/list/list.page';
import { EventsPreviewPage } from '../pages/events/download/events-preview.page';
import { EventsViewPage } from '../pages/events/view/events-view.page';
import { ForgetPasswordPage } from '../pages/forget-password/forget-password';
import { GalleryPage } from '../pages/gallery/gallery';
import { GalleryPage } from '../pages/gallery/gallery.page';
import { ItemsPopupPage } from '../pages/assessments/popup/items-popup.page';
import { LeaderboardSettingsPage } from '../pages/settings/leaderboard/leaderboard-settings.page';
import { LevelsListPage } from '../pages/levels/list/list';
import { LoginPage } from '../pages/#/#';
import { MagicLinkPage } from '../pages/magic-link/magic-link';
Expand All @@ -79,7 +79,7 @@ import { ResetPasswordPage } from '../pages/reset-password/reset-password';
import { SettingsPage } from '../pages/settings/settings.page';
import { SidenavPage } from '../pages/sidenav/sidenav';
import { TabsPage } from '../pages/tabs/tabs.page';
import { TeamPage } from '../pages/team/team';
import { TeamPage } from '../pages/team/team.page';
import { TermsConditionsPage } from '../pages/registration/terms-conditions/terms-conditions.page';
import { TestPage } from '../pages/tabs/test.page';
import { TutorialPage } from '../pages/settings/tutorial/tutorial.page';
Expand Down Expand Up @@ -117,7 +117,6 @@ export function createTranslateLoader(http: HttpClient) {
ForgetPasswordPage,
GalleryPage,
ItemsPopupPage,
LeaderboardSettingsPage,
LevelComponent,
LevelsListPage,
LoadingMarkerComponent,
Expand Down Expand Up @@ -150,6 +149,7 @@ export function createTranslateLoader(http: HttpClient) {
EscapeHtmlPipe,
],
imports: [
AppConfigModule,
BrowserModule,
CacheModule,
FormsModule,
Expand Down Expand Up @@ -230,7 +230,6 @@ export function createTranslateLoader(http: HttpClient) {
ForgetPasswordPage,
ItemsPopupPage,
GalleryPage,
LeaderboardSettingsPage,
LevelComponent,
LevelsListPage,
LoadingMarkerComponent,
Expand Down
17 changes: 10 additions & 7 deletions src/pages/activities-classic/list/activities-classic-list.page.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/**
* @TODO: I believe we can delete this now
*/
import { Component } from '@angular/core';
import { NavController, ToastController, LoadingController } from 'ionic-angular';

Expand All @@ -10,7 +13,7 @@ declare var _: any;
templateUrl: './list.html'
})
export class ActivitiesClassicListPage {
public activities: Array<any> = [];
activities: Array<any> = [];

constructor(
public navCtrl: NavController,
Expand Down Expand Up @@ -38,7 +41,7 @@ export class ActivitiesClassicListPage {
/**
* normalise activities
*/
public normaliseActivities(activities): Array<any> {
normaliseActivities(activities): Array<any> {
let result = [];

activities.forEach((act, index) => {
Expand Down Expand Up @@ -78,7 +81,7 @@ export class ActivitiesClassicListPage {
});
}

public doRefresh(refresher) {
doRefresh(refresher) {
this._pullData(this.activities, () => {
if (refresher) {
refresher.complete();
Expand All @@ -103,19 +106,19 @@ export class ActivitiesClassicListPage {
});
}

public hasReservation(activity) {
hasReservation(activity) {
return false;
}

public viewTicket(activity) {
viewTicket(activity) {

}

public book(activity) {
book(activity) {

}

public gotoActivity(activity) {
gotoActivity(activity) {
console.log(activity);
this.navCtrl.push(ActivitiesViewPage, {activity});
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/activities/list/popup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { loadingMessages, errMessages } from '../../../app/messages';
templateUrl: 'popup.html'
})
export class ActivityListPopupPage {

achievementData: any = null;
achievementName: string;
achievementsLoadingErr: any = errMessages.General.loading.load;
Expand Down
10 changes: 3 additions & 7 deletions src/pages/assessments/assessments.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
<ion-header>
<ion-navbar>
<ion-title></ion-title>

<ion-buttons end>
<button ion-button (click)="clickSubmit()" class="btn-submit" *ngIf="allowSubmit">
{{ 'GENERAL.SUBMIT' | translate }}
</button>
</ion-buttons>
</ion-navbar>
</ion-header>
<ion-content class="assessments-list">

<ion-content>
<div *ngFor="let assessmentGroup of assessmentGroups; let i = index">
<div *ngFor="let assessment of assessmentGroup; let j = index">

<ion-card *ngIf="assessment.description" class="no-box-shadow">
<ion-card-content>
<h2 class="text-center">{{ assessment.name }}</h2>
<div [innerHTML]="assessment.description"></div>
<h2 class="text-center assessment-title">{{ assessment.name }}</h2>
<p [innerHTML]="assessment.description" class="assessment-description"></p>
</ion-card-content>
</ion-card>

<questionGroup
*ngFor="let group of assessment.AssessmentGroup; let q = index"
[group]="group"
Expand Down
Loading