Continue Development

[dan-tang-ssd]

This PR is submitted to fix #1 and fix #2

This is not yet ready for review. It is now submitted as progress update.

This branch has merged PR #12 and PR #13 to further develop features required for #1 and #2.

This PR has below changes so far:

1. app panel, add ODK Form Management page
2. admin panel, team resource, add xlsforms relation manager

---

Questions:

• @dave-mills do we need to have Dataset resource in admin panel?

[dave-mills]

@dan-tang-ssd I would include it for now

[dan-tang-ssd]

Hi @dave-mills , here is a progress update, and I need your advice:

• admin panel > Xlsform Templates resource, can create a new xlsform template successfully (I used the simplest_odk_form with one question for testing)
• added Dataset resource in admin panel, created a dataset for main survey, edit existing xlsform template to map Main Survey to main survey dataset
• app panel > ODK Form Management resource. I scanned the QR code to create new project in ODK Collect, created and submitted 1 ODK submission to ODK central
• admin panel > Teams resource > xlsforms relation manager > click "Pull Submissions" button. submissions, entities, entity_values, main_surveys records created, but "No. of Submissions" shows 0 in front end (Any idea...?)

---

Screen shots:

[dave-mills]

@dan-tang-ssd - one thought is that if you're not a member of the team, the "0 submissions" might be due to the default global scope on the Submission model. (From memory, it's not overridden even if you have admin access, which is something I think we should change).

[dan-tang-ssd]

@dan-tang-ssd - one thought is that if you're not a member of the team, the "0 submissions" might be due to the default global scope on the Submission model. (From memory, it's not overridden even if you have admin access, which is something I think we should change).

Thank you Dave.

Yes, the default global scope on Submission model is the cause. We may change it at some point later on.

---

Screen shots:

Login as test admin

Login as test user

[dan-tang-ssd]

I think we reached a point for review now.

Most major features listed in issue #1 and issue #2 are ready. We can work on remaining minor items in forecoming PRs.

We can merge everything into wip branch, then merge wip branch into dev branch and start building a staging site. The goal is to make it up and running first, so that team members can start working on their own tasks.

I would like to build the staging site then start working on Alex T's ODK form. As these forms will involve many program changes, e.g. create database tables for main survey, repeat groups, etc,

---

This PR contains below changes:

1. admin panel, team resource, add xlsforms relation manager
2. app panel, add ODK Form Management page, add Show Submissions page
3. app panel > ODK Form Management > Show Submissions > Submissions tab > Edit submission

---

I performed below testing, with positive testing result in local env:

1. Create a new team, crosscheck a new project is created in ODK central
2. Create a new Xlsform Template, set it to Available to use
3. Create Xlsform to a Team, publish xlsform to ODK central, crosscheck a new xlsform is created in ODK central
4. ODK Collect, create a new project by scanning QR code, create and submit a new ODK form
5. Crosscheck ODK submission is received in ODK central
6. Pull submissions into data platform
7. View submission summary, edit submission content

---

Detail steps are listed below for reference:

1. Login as admin, go to admin panel
2. Xlsform Template > create a dataset for Main Survey, create a xlsform template, map main survey section to Main Survey dataset
3. Xlsform Template > set the new xlsform template as "Available for use"
4. Teams > xlsforms relation manager > add XLsform to Team, then Publish it to ODK central
5. Logout, then login as test user, go to app panel automatically
6. ODK Form Management, scan QR code in Android app ODK Collect, create new project, create and submit new ODK form
7. ODK submission has been submitted from ODK Collect to ODK central
8. Logout, login as admin, go to admin panel
9. Teams > xlsforms relation manager > Pull Submissions
10. Logout, login as test user
11. ODK Form Management > Show Submission > Submissions tab, Edit

---

Screen shots: