Skip to content

[ISDK-40] Feature/ranking feature module #20

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
DamengRandom wants to merge 374 commits into
base: master
Choose a base branch
from
Open

[ISDK-40] Feature/ranking feature module #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
374 commits
Select commit Hold shift + click to select a range
098d540
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-46/question-…
imkven Jul 27, 2017
c0ad789
[ISDK-41] quick fix for activity in assessment page
trtshen Jul 27, 2017
7344676
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-46/question-…
imkven Jul 27, 2017
eaac1ba
Mapping question and reviewer submission [ISDK-34]
imkven Jul 27, 2017
93d2ecc
Reviewer answer and comment [ISDK-34]
imkven Jul 27, 2017
b761032
[ISDK-41] checkin page for the event
trtshen Jul 27, 2017
830eea2
[ISDK-41] show view checkin when submission exist
trtshen Jul 27, 2017
6a3ff6e
[ISDK-58] feature/change percentage calculation to average score for …
Jul 28, 2017
f7dec48
[ISDK-41] must split interpolation to keep translation
trtshen Jul 28, 2017
64ee192
Support file type feedback [ISDK-34]
imkven Jul 28, 2017
e029581
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-34/reviewer-…
imkven Jul 28, 2017
e87a4dd
Not allow change when submission not new or in progress [ISDK-34]
imkven Jul 28, 2017
866b6cb
[ISDK-58] feature/add comment for do changes once ISDK-57 has been me…
Jul 28, 2017
988e802
[ISDK-41] merging assessment to submission for rendering checkin page
trtshen Jul 28, 2017
2491aae
Not showing feedback when status not published [ISDK-34]
imkven Jul 28, 2017
b38411a
[ISDK-41] checkin view added
trtshen Jul 28, 2017
7c737e7
More properly error handle [ISDK-34]
imkven Jul 31, 2017
a8bba09
[ISDK-35] removed hardcoded badges + skip load prompt
trtshen Jul 31, 2017
89e33ca
Show feedback available status in question group [ISDK-34]
imkven Jul 31, 2017
f8ab096
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-34/reviewer-…
imkven Jul 31, 2017
66f22b5
Remove old function [ISDK-34]
imkven Jul 31, 2017
21bd55a
[ISDK-48] display in progress assessment
trtshen Aug 1, 2017
c8556bf
Fix missing answer error [ISDK-34]
imkven Aug 1, 2017
ef6e620
Move activity normalise partial code to activity service [ISDK-34]
imkven Aug 1, 2017
97aa107
Update mapping function [ISDK-34]
imkven Aug 1, 2017
291b1f0
Fix submission button hidden bug [ISDK-34]
imkven Aug 1, 2017
959c627
Normalise assessments data [ISDK-34]
imkven Aug 1, 2017
996a805
[ISDK-49] display submission in "In Progress"
trtshen Aug 1, 2017
f068d34
No more normalise in assessment-group [ISDK-34]
imkven Aug 1, 2017
d7165c4
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-34/reviewer-…
imkven Aug 1, 2017
6abee4a
Show status for question's group [ISDK-34]
imkven Aug 1, 2017
1333887
[ISDK-41] brought back group
trtshen Aug 1, 2017
6eadba2
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-34/reviewer-…
imkven Aug 1, 2017
c480d21
Do not show review answer when submission not publish yet [ISDK-34]
imkven Aug 2, 2017
850351f
Fix submit button problem [ISDK-34]
imkven Aug 2, 2017
b946935
[ISDK-41] use disabled directive
trtshen Aug 2, 2017
d77d91f
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-34/reviewer-…
imkven Aug 2, 2017
666783f
[ISDK-41] non-checkin should pass "in_progress" flag too
trtshen Aug 2, 2017
3c195d8
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-34/reviewer-…
imkven Aug 3, 2017
6addc92
More complex checking of assessment status [ISDK-34]
imkven Aug 3, 2017
c978b63
More complex review handler [ISDK-34]
imkven Aug 3, 2017
b889431
[ISDK-41] fixed overlapped text before assessment
trtshen Aug 3, 2017
d3363b2
[ISDK-41] check "done" instead of "complete" in assessment status
trtshen Aug 3, 2017
2223534
No assume review give if it is null [ISDK-34]
imkven Aug 3, 2017
584ab04
Merge branch 'feature/ISDK-34/reviewer-feedback' into feature/ISDK-41…
trtshen Aug 3, 2017
12bad35
Don't not handle empty answer [ISDK-34]
imkven Aug 3, 2017
82a5149
Merge branch 'feature/ISDK-34/reviewer-feedback' into feature/ISDK-41…
trtshen Aug 3, 2017
b76f61f
[ISDK-41] should display popup after submission
trtshen Aug 3, 2017
834c8b8
Merge branch 'feature/ISDK-41/checkin' into feature/ISDK-34/reviewer-…
imkven Aug 4, 2017
d6b022f
Hide status when submission not in progress [ISDK-34]
imkven Aug 4, 2017
0c9635d
Fix description position [ISDK-34]
imkven Aug 4, 2017
b028084
Can download file [ISDK-34]
imkven Aug 4, 2017
a05812c
Update css for disabled component [ISDK-34]
imkven Aug 4, 2017
a286c03
Hide submit and save button [ISDK-34]
imkven Aug 4, 2017
4c644a6
[ISDK-34] enhanced plus button
trtshen Aug 4, 2017
3dbf1c7
Merge branch 'feature/ISDK-34/reviewer-feedback' into feature/ISDK-34…
trtshen Aug 4, 2017
68863e3
Merge branch 'feature/ISDK-34/plus-btn-enhance' into feature/ISDK-34/…
imkven Aug 4, 2017
1106886
Fix normalise submission error [ISDK-34]
imkven Aug 4, 2017
2b2eebe
[ISDK-34] use NgIf directive instead of customise style for "disable"
trtshen Aug 4, 2017
7fae6db
Merge branch 'feature/ISDK-34/plus-btn-enhance' into feature/ISDK-34/…
trtshen Aug 4, 2017
957f2fb
[ISDK-34] force submission load completely
trtshen Aug 4, 2017
2369390
[ISDK-42] feature/change html link tag target attribute
Aug 6, 2017
e7b5371
[ISDK-58] merge ISDK-57 code together and ensure work properly
Aug 7, 2017
13e260f
Merge remote-tracking branch 'origin/feature/ISDK-35/merge-all-messag…
imkven Aug 7, 2017
b39ba8e
Merge remote-tracking branch 'origin/feature/ISDK-35/merge-all-messag…
imkven Aug 7, 2017
88bc702
Merge branch 'feature/ISDK-45/question-group-display' into develop
imkven Aug 7, 2017
ad9d38b
Merge branch 'feature/ISDK-34/reviewer-feedback' into develop
imkven Aug 7, 2017
e7b838f
[ISDK-34] fixed missing submit button
trtshen Aug 7, 2017
ef9951a
Merge remote-tracking branch 'origin/feature/ISDK-40/ranking-feature-…
imkven Aug 7, 2017
b989d3f
Merge branch 'feature/ISDK-42/account-page-module' into develop
imkven Aug 7, 2017
7ab4b9c
Merge branch 'feature/ISDK-34/reviewer-feedback' into develop
imkven Aug 7, 2017
29b56d7
[ISDK-34] plus = create new assessment
trtshen Aug 7, 2017
fc5cf04
Merge branch 'feature/ISDK-58/*' into develop
imkven Aug 7, 2017
4bc0d32
Remove CharactersService [ISDK-56]
imkven Aug 7, 2017
3f9ff33
[ISDK-34] confirm submit multiple submission
trtshen Aug 7, 2017
fa5560c
[ISDK-34] fixed breaking event checkin after submission changes in ac…
trtshen Aug 7, 2017
1bae445
Fix allow submit will missing [ISDK-34]
imkven Aug 7, 2017
7870ba8
Merge branch 'feature/ISDK-34/reviewer-feedback' into develop
imkven Aug 7, 2017
c8f2934
[ISDK-34] should use back what is pass back from activity view page
trtshen Aug 9, 2017
f993026
Game service updated [ISDK-68]
imkven Aug 10, 2017
f2de774
List out the event until it hit the end time [ISDK-66]
imkven Aug 9, 2017
e881282
Game service updated fixed
imkven Aug 16, 2017
0a2d0b0
Find game_id after user login [ISDK-68]
imkven Aug 10, 2017
eb61ce2
Fix no experience display error [ISDK-68]
imkven Aug 10, 2017
7a37e27
Update ranking code [ISDK-40]
imkven Aug 16, 2017
772fbb3
Update character service [ISDK-68]
imkven Aug 16, 2017
154af25
Update ranking page [ISDK-68]
imkven Aug 16, 2017
135f37e
hotfix/auth-api-cors-issue
Aug 10, 2017
afcef38
Update color schema
imkven Aug 11, 2017
a875ffe
Fix missing colors
imkven Aug 14, 2017
f907328
Update colour again
imkven Aug 14, 2017
9e9cdb9
Update my character
imkven Aug 14, 2017
52b6f08
Fix conflict
imkven Aug 16, 2017
23936c5
tiny testing
imkven Aug 16, 2017
01d651e
feature api new changes WIP
imkven Aug 16, 2017
32501dc
feature/api-new-changes-dashboard-refactor
imkven Aug 16, 2017
ac434f2
[ISDK-59] submission change get items API WIP
imkven Aug 16, 2017
307e6f0
[ISDK-59] submission popup new changes
imkven Aug 16, 2017
e4066bd
[ISDK-59] dashboard page average score calculation change
imkven Aug 16, 2017
466dc1a
Try move modal load to function [ISDK-59]
imkven Aug 16, 2017
78a3e55
[ISDK-59] items popup final draft
imkven Aug 16, 2017
60959ab
Update ranking code [ISDK-68]
imkven Aug 16, 2017
fc3b4c6
Hide name [ISDK-68]
imkven Aug 16, 2017
d7599f4
[ISDK-34] added proper differentiation of submission statuses
trtshen Aug 9, 2017
b230f58
[ISDK-34] set question + answer = null (whenever empty)
trtshen Aug 10, 2017
30884c3
[ISDK-34] fixed compulsory checking and submission name
trtshen Aug 10, 2017
c0595ac
[ISDK-34] import and use momentModule
trtshen Aug 10, 2017
a16d55c
[ISDk-34] preprocess time first before display
trtshen Aug 10, 2017
ff72f2d
hotfix/ios screen unclickable first time loading
Aug 16, 2017
e2c3fd3
[ISDK-35] removed hardcoded badges + skip load prompt
trtshen Jul 31, 2017
28d337f
Try pass data to children page [ISDK-19]
imkven Aug 17, 2017
6736ba0
Fix API changed issue [ISDK-38]
imkven Jul 6, 2017
217544b
Call API with folkJoin [ISDK-38]
imkven Jul 10, 2017
ca0c88e
Fix can not display assessment after API changed [ISDK-15]
imkven Jul 11, 2017
b85f776
Get submissions when question group page loaded [ISDK-45]
imkven Aug 17, 2017
42b325c
Render question group with new API format [ISDK-45]
imkven Jul 12, 2017
7e3df8c
Mapping submission to question [ISDK-45]
imkven Jul 12, 2017
ec87509
Fix can not get assessment [ISDK-45]
imkven Jul 12, 2017
805d744
Show question group status [ISDK-45]
imkven Jul 12, 2017
46b1059
Disable submit when have some question group not completed [ISDK-45]
imkven Jul 12, 2017
f98ff34
Fix breaking from API changed [ISDK-45]
imkven Jul 13, 2017
71bf599
Pass data to question page [ISDK-47]
imkven Jul 13, 2017
fdcd0c3
Fix unable render questions correctly [ISDK-47]
imkven Jul 14, 2017
21188e3
Mapping assessment and submission [ISDK-47]
imkven Jul 14, 2017
b87ca4b
Normalise references [ISDK-47]
imkven Aug 17, 2017
cfa9ce7
Normalise activity data [ISDK-47]
imkven Aug 17, 2017
b5ce3bf
Update classes [ISDK-47]
imkven Aug 17, 2017
136cb1c
Fix api changed break [ISDK-47]
imkven Jul 17, 2017
67e8ef6
Change question group UI [ISDK-45]
imkven Jul 19, 2017
1e5696d
Link to assessment page [ISDK-41]
imkven Aug 17, 2017
21424ed
Disable cancel booking button for attended [ISDK-41]
imkven Jul 18, 2017
9c16a41
[ISDK-45] lib updates
imkven Aug 17, 2017
aaf4211
[ISDK-41] normalise activity like before assessment view
imkven Aug 17, 2017
05cea34
[ISDK-49] save locally first and check validity
trtshen Jul 11, 2017
c44bf64
[ISDK-19] done normalise functions
imkven Aug 17, 2017
6f657f7
[ISDK-19] added default config.ts
trtshen Jul 14, 2017
e8afb66
[ISDK-19] make it storable locally
imkven Aug 17, 2017
655e4f0
[ISDK-49] normalise activities response
imkven Aug 17, 2017
5302119
[ISDK-22] retrieve submissions from API
imkven Aug 17, 2017
5b5a3cd
[ISDK-49] use group question from assessmenGroup page
imkven Aug 17, 2017
e50217c
[ISDK-49] removed unnecessary "classic activity view"
trtshen Jul 18, 2017
2e86e0a
[ISDK-49] display remote submission in activity view page
trtshen Jul 18, 2017
e70b91a
[ISDK-49] added loading indicator
trtshen Jul 18, 2017
3175eaa
[ISDK-49] change offline data format
trtshen Jul 19, 2017
ba61a30
[ISDK-49] multiple updates on styling
trtshen Jul 19, 2017
65e087b
[ISDK-19] just accept one file submission
trtshen Jul 19, 2017
298d947
[ISDK-49] use single assessment object generated from activityView
imkven Aug 17, 2017
fc3796c
[ISDK-49] display error when submission status error
trtshen Jul 20, 2017
e690501
[ISDK-49] "key" for file upload submission
trtshen Jul 20, 2017
6412037
dependencies changes
trtshen Jul 25, 2017
5e3cfce
[ISDK-41] direct page to upload attachment
imkven Aug 17, 2017
14c65dc
[ISDK-41] prep achievement & save as submit for checkin
imkven Aug 17, 2017
7721be5
Show confirm message when click save [ISDK-49]
imkven Jul 24, 2017
7895a3b
Remove discard message [ISDK-49]
imkven Aug 17, 2017
4af3bab
[ISDK-41] reuse of normaliseActivity from singleton
imkven Aug 17, 2017
00b5010
[ISDK-41] make sure using correct context
trtshen Jul 26, 2017
ef358cc
[ISDK-41] pass achievements to activity view (for reuseability)
imkven Aug 17, 2017
8d037b4
Allow do submit answer [ISDK-46]
imkven Jul 25, 2017
0e53e0a
Remove hardcoded request data [ISDK-46]
imkven Aug 17, 2017
7dd951b
Hide submit button when submission status is done [ISDK-46]
imkven Aug 17, 2017
ddce609
Remove assessment [ISDK-46]
imkven Aug 17, 2017
70e31b0
[ISDK-41] quick fix for activity in assessment page
trtshen Jul 27, 2017
8c372b5
Mapping question and reviewer submission [ISDK-34]
imkven Jul 27, 2017
ba1168f
Reviewer answer and comment [ISDK-34]
imkven Jul 27, 2017
1a8f970
Support file type feedback [ISDK-34]
imkven Jul 28, 2017
c928ac5
[ISDK-41] checkin page for the event
trtshen Jul 27, 2017
bcd0a39
[ISDK-41] show view checkin when submission exist
imkven Aug 17, 2017
7f3e230
[ISDK-41] must split interpolation to keep translation
imkven Aug 17, 2017
4830386
Not allow change when submission not new or in progress [ISDK-34]
imkven Jul 28, 2017
6f96b38
Not showing feedback when status not published [ISDK-34]
imkven Jul 28, 2017
c58f86e
More properly error handle [ISDK-34]
imkven Jul 31, 2017
60e9d11
Show feedback available status in question group [ISDK-34]
imkven Jul 31, 2017
0b5e8ac
[ISDK-41] merging assessment to submission for rendering checkin page
trtshen Jul 28, 2017
e3c0d90
[ISDK-41] checkin view added
trtshen Jul 28, 2017
76fcf1d
Remove old function [ISDK-34]
imkven Jul 31, 2017
ab1fe77
Fix missing answer error [ISDK-34]
imkven Aug 1, 2017
e027eb0
Move activity normalise partial code to activity service [ISDK-34]
imkven Aug 17, 2017
d1d99af
Update mapping function [ISDK-34]
imkven Aug 1, 2017
32188d1
Fix submission button hidden bug [ISDK-34]
imkven Aug 1, 2017
ece7cf5
Normalise assessments data [ISDK-34]
imkven Aug 1, 2017
abb924e
No more normalise in assessment-group [ISDK-34]
imkven Aug 1, 2017
c4ee3b5
[ISDK-48] display in progress assessment
imkven Aug 17, 2017
cb3f34e
[ISDK-49] display submission in "In Progress"
imkven Aug 17, 2017
1edd0b5
Show status for question's group [ISDK-34]
imkven Aug 1, 2017
1f14041
[ISDK-41] brought back group
imkven Aug 17, 2017
d8a6862
[ISDK-41] use disabled directive
trtshen Aug 2, 2017
57fdb83
[ISDK-41] non-checkin should pass "in_progress" flag too
trtshen Aug 2, 2017
0a80365
[ISDK-41] fixed overlapped text before assessment
trtshen Aug 3, 2017
6d05e9b
[ISDK-41] check "done" instead of "complete" in assessment status
trtshen Aug 3, 2017
27cabf2
Do not show review answer when submission not publish yet [ISDK-34]
imkven Aug 17, 2017
07569a2
Fix submit button problem [ISDK-34]
imkven Aug 2, 2017
a0a1ad7
More complex checking of assessment status [ISDK-34]
imkven Aug 3, 2017
2835ad5
More complex review handler [ISDK-34]
imkven Aug 3, 2017
3c93ac9
No assume review give if it is null [ISDK-34]
imkven Aug 3, 2017
896d218
Don't not handle empty answer [ISDK-34]
imkven Aug 3, 2017
2710b63
[ISDK-41] should display popup after submission
trtshen Aug 3, 2017
b0039f5
Hide status when submission not in progress [ISDK-34]
imkven Aug 4, 2017
fcc66f2
Fix description position [ISDK-34]
imkven Aug 4, 2017
f8a7833
Can download file [ISDK-34]
imkven Aug 4, 2017
24e2143
Update css for disabled component [ISDK-34]
imkven Aug 4, 2017
35fe325
Hide submit and save button [ISDK-34]
imkven Aug 4, 2017
fcd751e
[ISDK-34] enhanced plus button
imkven Aug 17, 2017
e32bd35
Fix normalise submission error [ISDK-34]
imkven Aug 4, 2017
11f75d4
[ISDK-34] use NgIf directive instead of customise style for "disable"
trtshen Aug 4, 2017
cd191f3
[ISDK-34] force submission load completely
trtshen Aug 4, 2017
2ee690e
[ISDK-50] feature tour guide function draft
imkven Aug 17, 2017
1ed3f47
[ISDK-52] feature/ keep conosutant betwen ISDK-50 and ISDK-52
Jul 13, 2017
f76e02a
[ISDK-52] feature/account page android display styling change
imkven Aug 17, 2017
36ff1d7
[ISDK-53] feature/leaderboard settings page inside account page draft
imkven Aug 17, 2017
c4b4ab8
[ISDK-53] feature/hide leaderboard settings button for SDK
Jul 25, 2017
979eceb
[ISDK-42] feature/change html link tag target attribute
Aug 6, 2017
af2a49d
[ISDK-34] fixed missing submit button
trtshen Aug 7, 2017
a0e4346
[ISDK-57] feature/change activity list page user achievements api
imkven Aug 17, 2017
5953471
[ISDK-58] feature/change percentage calculation to average score for …
imkven Aug 17, 2017
5db177d
[ISDK-58] feature/add comment for do changes once ISDK-57 has been me…
Jul 28, 2017
3b0f3cb
[ISDK-58] merge ISDK-57 code together and ensure work properly
imkven Aug 17, 2017
a8d1fc6
Remove CharactersService [ISDK-56]
imkven Aug 17, 2017
c4706d6
[ISDK-34] plus = create new assessment
imkven Aug 17, 2017
cf408bc
[ISDK-34] confirm submit multiple submission
trtshen Aug 7, 2017
587de13
[ISDK-34] fixed breaking event checkin after submission changes in ac…
trtshen Aug 7, 2017
3b781b3
Fix allow submit will missing [ISDK-34]
imkven Aug 7, 2017
7ffd441
Find game_id after user login [ISDK-68]
imkven Aug 10, 2017
7986d87
Fix no experience display error [ISDK-68]
imkven Aug 10, 2017
cd5d1fb
Update ranking code [ISDK-40]
imkven Aug 16, 2017
61ac75c
Update character service [ISDK-68]
imkven Aug 16, 2017
3c4c2c6
Update ranking page [ISDK-68]
imkven Aug 16, 2017
cd450f8
hotfix/auth-api-cors-issue
Aug 10, 2017
c1d45a4
Update color schema
imkven Aug 11, 2017
1f7eadd
Fix missing colors
imkven Aug 14, 2017
18b119e
Update colour again
imkven Aug 14, 2017
2df77ac
Update my character
imkven Aug 14, 2017
cf5fdd3
[ISDK-59] feature/submission-item-earned
imkven Aug 17, 2017
48150d0
[ISDK-59] feature/tiny testing
imkven Aug 17, 2017
3768ce5
feature api new changes WIP
imkven Aug 17, 2017
535645a
feature/api-new-changes-dashboard-refactor
imkven Aug 17, 2017
791e969
[ISDK-59] submission change get items API WIP
imkven Aug 17, 2017
cf96be8
[ISDK-59] submission popup new changes
imkven Aug 17, 2017
de0d93d
[ISDK-59] dashboard page average score calculation change
imkven Aug 17, 2017
fd5f126
Try move modal load to function [ISDK-59]
imkven Aug 17, 2017
742347a
[ISDK-59] items popup final draft
imkven Aug 17, 2017
175a457
Update ranking code [ISDK-68]
imkven Aug 16, 2017
b9e8d7a
Hide name [ISDK-68]
imkven Aug 17, 2017
bd8aeda
[ISDK-34] should use back what is pass back from activity view page
imkven Aug 17, 2017
578a0eb
[ISDK-34] added proper differentiation of submission statuses
trtshen Aug 9, 2017
7c1a05a
[ISDK-34] set question + answer = null (whenever empty)
trtshen Aug 10, 2017
d950cd0
[ISDK-34] fixed compulsory checking and submission name
trtshen Aug 10, 2017
a41668c
[ISDK-34] import and use momentModule
trtshen Aug 10, 2017
4a0dc9a
[ISDk-34] preprocess time first before display
trtshen Aug 10, 2017
c7b2fd9
Fix conflict
imkven Aug 17, 2017
ad77e89
Merge branch 'develop' into feature/ISDK-40/ranking-feature-module
imkven Aug 17, 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
7 changes: 0 additions & 7 deletions bower.json
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions ionic.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
{
"name": "Practera SDK - Ionic",
"app_id": "",
"gulpStartupTasks": [
"sass",
"watch"
],
"watchPatterns": [
"www/**/*",
"!www/lib/**/*",
"!www/**/*.map"
],
"type": "ionic-angular"
}
Loading