-
+
Ya
Yes
-
+
Tidak
No
@@ -169,27 +174,48 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/antropometri/form_definition.json b/opensrp-sdidtk/src/main/assets/www/form/antropometri/form_definition.json
index 67433a54a..fcf8033bd 100644
--- a/opensrp-sdidtk/src/main/assets/www/form/antropometri/form_definition.json
+++ b/opensrp-sdidtk/src/main/assets/www/form/antropometri/form_definition.json
@@ -2,12 +2,36 @@
"form_data_definition_version": "1",
"form": {
"bind_type": "anak",
+ "ec_bind_type":"ec_anak",
"default_bind_path": "/model/instance/antropometri/",
"fields": [
{
"name": "id",
"shouldLoadValue": true
},
+ {
+ "name": "start",
+ "bind": "/model/instance/antropometri/start"
+ },
+ {
+ "name": "end",
+ "bind": "/model/instance/antropometri/end"
+ },
+ {
+ "name": "existing_location",
+ "bind": "/model/instance/antropometri/existing_location",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "desa_anak",
+ "bind": "/model/instance/antropometri/Village",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "dusun",
+ "bind": "/model/instance/antropometri/existing_Sub-village",
+ "shouldLoadValue": true
+ },
{
"name": "umur",
"bind": "/model/instance/antropometri/umur",
@@ -74,12 +98,8 @@
"value": "false"
},
{
- "name": "reg_date",
+ "name": "today",
"bind": "/model/instance/antropometri/today"
- },
- {
- "name": "registrationDate",
- "bind": "/model/instance/antropometri/reg_date"
}
]
}
diff --git a/opensrp-sdidtk/src/main/assets/www/form/antropometri/model.xml b/opensrp-sdidtk/src/main/assets/www/form/antropometri/model.xml
index 9f3dc6d2a..b2efa2e46 100644
--- a/opensrp-sdidtk/src/main/assets/www/form/antropometri/model.xml
+++ b/opensrp-sdidtk/src/main/assets/www/form/antropometri/model.xml
@@ -1,32 +1,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID
+
+
+
+
+
+
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form.json b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form.json
new file mode 100644
index 000000000..7b4002c53
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form.json
@@ -0,0 +1 @@
+{"name":"Registrasi_Gizi-NewStructure-map","title":"Registrasi Gizi","sms_keyword":"registrasi_gizi_new","default_language":"Bahasa","instance":{"encounter_type":"Registrasi Gizi"},"version":"201702131126","id_string":"registrasi_gizi_new","type":"survey","children":[{"instance":{"openmrs_entity_id":"encounter_start","openmrs_entity":"encounter"},"type":"start","name":"start"},{"instance":{"openmrs_entity_id":"encounter_date","openmrs_entity":"encounter"},"type":"today","name":"today"},{"type":"deviceid","name":"deviceid"},{"type":"simserial","name":"simserial"},{"type":"phonenumber","name":"phonenumber"},{"type":"hidden","name":"Province"},{"type":"hidden","name":"District","hint":{"Bahasa":"Inject from app"}},{"type":"hidden","name":"Sub-district","hint":{"Bahasa":"Inject from app"}},{"type":"hidden","name":"Village","hint":{"Bahasa":"Inject from app"}},{"type":"hidden","name":"Sub-village","hint":{"Bahasa":"Inject from app"}},{"instance":{"openmrs_entity_id":"UniqueId","openmrs_entity":"person_attribute"},"type":"hidden","name":"unique_id"},{"type":"note","name":"generated_note_name_14","label":{"Bahasa":"Desa : ${Village}"}},{"type":"note","name":"generated_note_name_15","label":{"Bahasa":"Dusun : ${Sub-village}"}},{"bind":{"calculate":"${Village}"},"type":"hidden","name":"existing_location","instance":{"openmrs_entity_id":"location_id","openmrs_entity":"encounter"}},{"bind":{"calculate":"${Province}"},"type":"calculate","name":"provinsi","instance":{"openmrs_entity_parent":"usual_residence","openmrs_entity_id":"stateProvince","openmrs_entity":"person_address"}},{"bind":{"calculate":"${District}"},"type":"calculate","name":"kabupaten","instance":{"openmrs_entity_parent":"usual_residence","openmrs_entity_id":"countyDistrict","openmrs_entity":"person_address"}},{"bind":{"calculate":"${Village}"},"type":"calculate","name":"desa","instance":{"openmrs_entity_parent":"usual_residence","openmrs_entity_id":"cityVillage","openmrs_entity":"person_address"}},{"bind":{"calculate":"${Sub-village}"},"type":"calculate","name":"dusun","instance":{"openmrs_entity_parent":"usual_residence","openmrs_entity_id":"address1","openmrs_entity":"person_address"}},{"bind":{"calculate":"${Sub-district}"},"type":"calculate","name":"kecamatan","instance":{"openmrs_entity_parent":"usual_residence","openmrs_entity_id":"address2","openmrs_entity":"person_address"}},{"name":"pasien_wilayah","bind":{"required":"yes"},"label":{"Bahasa":"Apakah anak adalah sasaran wilayah Anda?","English":"Is the child living in your catchment area?"},"instance":{"openmrs_entity_id":"160637AAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"concept"},"type":"select one","children":[{"instance":{"openmrs_code":"160635AAAAAAAAAAAAAAAAAAAAAAAAAA"},"name":"pasien_wilayah_desa","label":{"Bahasa":"Ya","English":"Yes"}},{"instance":{"openmrs_code":"160636AAAAAAAAAAAAAAAAAAAAAAAAAA"},"name":"pasien_luar_wilayah","label":{"Bahasa":"Tidak","English":"No"}}]},{"name":"pasien_pindahan","bind":{"required":"yes"},"label":{"Bahasa":"Apakah anak ini pindahan dari desa lain?","English":"Is the child moving in to this village?"},"instance":{"openmrs_entity_id":"160563AAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"concept"},"type":"select one","children":[{"instance":{"openmrs_code":"1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"},"name":"Yes","label":{"Bahasa":"Ya","English":"Yes"}},{"instance":{"openmrs_code":"1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"},"name":"No","label":{"Bahasa":"Tidak","English":"No"}}]},{"name":"tgl_pindah","hint":{"Bahasa":"Tuliskan tanggal anak pindah ke desa ini","English":"Write the date when the mother moved into this village"},"bind":{"relevant":"${pasien_pindahan}='ya'","required":"yes","constraint":".<${today}"},"label":{"Bahasa":"Sejak kapan anak pindah ke sini?","English":"Since when did she move this village?"},"instance":{"openmrs_entity_id":"160534AAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"concept"},"type":"date"},{"label":{"Bahasa":"Nama Posyandu","English":"Health Post"},"type":"text","name":"posyandu","hint":{"Bahasa":"Nama Pos Pelayanan Terpadu","English":"Name of Health Post"}},{"instance":{"openmrs_entity_id":"last_name","openmrs_entity":"person"},"label":{"Bahasa":"Nama Ayah","English":"Fathr's Name"},"type":"text","name":"nama_ayah","hint":{"Bahasa":"Nama Ayah Bayi yang diberikan Imunisasi","English":"Name of Baby's Father Receiving Immunization"}},{"instance":{"openmrs_entity_id":"first_name","openmrs_entity":"person"},"label":{"Bahasa":"Nama Ibu","English":"Mother's Name"},"type":"text","name":"nama_ibu","hint":{"Bahasa":"Nama Ibu Bayi yang diberikan Imunisasi","English":"Name of Baby's Mother Receiving Immunization"}},{"instance":{"openmrs_entity_id":"NoIbu","openmrs_entity":"person_attribute"},"type":"integer","name":"no_ibu","bind":{"required":"yes"},"label":{"Bahasa":"No. Ibu","English":"Mother's Number"}},{"instance":{"openmrs_entity_id":"nik","openmrs_entity":"person_identifier"},"label":{"Bahasa":"NIK","English":"National identification number"},"type":"integer","name":"nik","hint":{"Bahasa":"Nomor KTP (Kartu Tanda Penduduk)","English":"Personal identity number"}},{"default":"0","instance":{"openmrs_entity_id":"1532AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"concept"},"type":"hidden","name":"umur","hint":{"Bahasa":"for sync purpose"}},{"default":"0","instance":{"openmrs_entity_id":"374AAAAAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"concept"},"type":"hidden","name":"jenis_kontrasepsi","hint":{"Bahasa":"for sync purpose"}},{"instance":{"openmrs_entity_id":"Child Registration","openmrs_entity":"person"},"type":"repeat","children":[{"bind":{"calculate":"${Village}"},"type":"calculate","name":"desa_anak","instance":{"openmrs_entity_parent":"cityVillage","openmrs_entity_id":"160632AAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"Concept"}},{"type":"note","name":"generated_note_name_39","label":{"Bahasa":"Desa : ${desa_anak}"}},{"type":"note","name":"generated_note_name_40","label":{"Bahasa":"Unique ID: ${unique_id}"}},{"bind":{"calculate":"${Village}"},"type":"hidden","name":"child_existing_location","instance":{"openmrs_entity_id":"location_id","openmrs_entity":"encounter"}},{"name":"nama_bayi","hint":{"Bahasa":"Nama Bayi yang diberikan Imunisasi","English":"Name of Baby Receiving Immunization"},"bind":{"required":"yes"},"label":{"Bahasa":"Nama Bayi","English":"Baby's Name"},"instance":{"openmrs_entity_id":"1586AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"Concept"},"type":"text"},{"name":"jenis_kelamin","hint":{"Bahasa":"Jenis Kelamin Bayi/Balita Yang diberikan Imunisasi","English":"Gender of Baby Receiving Immunization"},"bind":{"required":"yes"},"label":{"Bahasa":"Jenis Kelamin","English":"Gender"},"instance":{"openmrs_entity_id":"gender","openmrs_entity":"person"},"type":"select one","children":[{"instance":{"openmrs_code":"1534AAAAAAAAAAAAAAAAAAAAAAAAAAAA"},"name":"male","label":{"Bahasa":"Laki - laki","English":"Male"}},{"instance":{"openmrs_code":"1535AAAAAAAAAAAAAAAAAAAAAAAAAAAA"},"name":"female","label":{"Bahasa":"Perempuan","English":"Female"}}]},{"name":"tanggal_lahir","hint":{"Bahasa":"Tanggal lahir Bayi","English":"Baby's date of birth"},"bind":{"required":"yes"},"label":{"Bahasa":"Tanggal lahir","English":"DOB"},"instance":{"openmrs_entity_id":"birthdate","openmrs_entity":"person"},"type":"date"},{"instance":{"openmrs_entity_id":"5916AAAAAAAAAAAAAAAAAAAAAAAAAAAA","openmrs_entity":"concept"},"label":{"Bahasa":"Berat badan saat Lahir","English":"Baby's birth weight"},"type":"integer","name":"berat_badan_saat_lahir","hint":{"Bahasa":"Berat badan lahir bayi","English":"Baby's birth weight"}},{"instance":{"openmrs_entity_id":"ibuCaseId","openmrs_entity":"person_relationship"},"type":"hidden","name":"ibu_entity_id"}],"name":"child_registration"},{"control":{"bodyless":true},"type":"group","children":[{"bind":{"readonly":"true()","calculate":"concat('uuid:', uuid())"},"type":"calculate","name":"instanceID"}],"name":"meta"}]}
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form.xml b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form.xml
new file mode 100644
index 000000000..012db2f2c
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form.xml
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form_definition.json b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form_definition.json
new file mode 100644
index 000000000..2a87904fc
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/form_definition.json
@@ -0,0 +1,172 @@
+{
+ "form_data_definition_version": "3",
+ "form": {
+ "bind_type": "kartu_ibu",
+ "ec_bind_type": "ec_kartu_ibu",
+ "default_bind_path": "/model/instance/Registrasi_Gizi-NewStructure-map/",
+ "fields": [
+ {
+ "name": "id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "pasienWilayah",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/pasien_wilayah",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "pasienPindahan",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/pasien_pindahan",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "tglPindah",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/tgl_pindah",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "noIbu",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/no_ibu"
+ },
+ {
+ "name": "existing_location",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/existing_location",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Village",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/Village",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Province",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/Province",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Sub-district",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/Sub-district",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_District",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/District",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Sub-village",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/Sub-village",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "provinsi",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/provinsi",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "kabupaten",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/kabupaten",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "kecamatan",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/kecamatan",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "desa",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/desa",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "dusun",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/dusun",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "posyandu",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/posyandu"
+ },
+ {
+ "name": "namaSuami",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/nama_ayah"
+ },
+ {
+ "name": "namalengkap",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/nama_ibu"
+ },
+ {
+ "name": "nik",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/nik"
+ },
+ {
+ "name": "jenisKontrasepsi",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/jenis_kontrasepsi"
+ },
+ {
+ "name": "isOutOfArea",
+ "value": "false"
+ },
+ {
+ "name": "submissionDate",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/today"
+ }
+ ],
+ "sub_forms": [
+ {
+ "name": "child_registration",
+ "bind_type": "anak",
+ "ec_bind_type": "ec_anak",
+ "default_bind_path": "/model/instance/Registrasi_Gizi-NewStructure-map/child_registration/",
+ "fields": [
+ {
+ "name": "id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "relationalid",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "injectedBaseEntityId",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "ibu_entity_id",
+ "source": "kartu_ibu.id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "unique_id",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/unique_id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "namaBayi",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/child_registration/nama_bayi"
+ },
+ {
+ "name": "jenisKelamin",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/child_registration/jenis_kelamin"
+ },
+ {
+ "name": "desa_anak",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/child_registration/desa_anak"
+ },
+ {
+ "name": "child_existing_location",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/child_registration/child_existing_location"
+ },
+ {
+ "name": "tanggalLahirAnak",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/child_registration/tanggal_lahir"
+ },
+ {
+ "name": "beratLahir",
+ "bind": "/model/instance/Registrasi_Gizi-NewStructure-map/child_registration/berat_badan_saat_lahir"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/model.xml b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/model.xml
new file mode 100644
index 000000000..a645b82fa
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_gizi/model.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form.json b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form.json
new file mode 100644
index 000000000..b224b81a9
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form.json
@@ -0,0 +1,528 @@
+{
+ "name": "Registrasi_Sdidtk",
+ "title": "Registrasi Sdidtk",
+ "sms_keyword": "registrasi_sdidtk",
+ "default_language": "Bahasa",
+ "instance": {
+ "encounter_type": "Registrasi Sdidtk"
+ },
+ "version": "201702131126",
+ "id_string": "registrasi_sdidtk",
+ "type": "survey",
+ "children": [
+ {
+ "instance": {
+ "openmrs_entity_id": "encounter_start",
+ "openmrs_entity": "encounter"
+ },
+ "type": "start",
+ "name": "start"
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "encounter_date",
+ "openmrs_entity": "encounter"
+ },
+ "type": "today",
+ "name": "today"
+ },
+ {
+ "type": "deviceid",
+ "name": "deviceid"
+ },
+ {
+ "type": "simserial",
+ "name": "simserial"
+ },
+ {
+ "type": "phonenumber",
+ "name": "phonenumber"
+ },
+ {
+ "type": "hidden",
+ "name": "Province"
+ },
+ {
+ "type": "hidden",
+ "name": "District",
+ "hint": {
+ "Bahasa": "Inject from app"
+ }
+ },
+ {
+ "type": "hidden",
+ "name": "Sub-district",
+ "hint": {
+ "Bahasa": "Inject from app"
+ }
+ },
+ {
+ "type": "hidden",
+ "name": "Village",
+ "hint": {
+ "Bahasa": "Inject from app"
+ }
+ },
+ {
+ "type": "hidden",
+ "name": "Sub-village",
+ "hint": {
+ "Bahasa": "Inject from app"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "UniqueId",
+ "openmrs_entity": "person_attribute"
+ },
+ "type": "hidden",
+ "name": "unique_id"
+ },
+ {
+ "type": "note",
+ "name": "generated_note_name_14",
+ "label": {
+ "Bahasa": "Desa : ${Village}"
+ }
+ },
+ {
+ "type": "note",
+ "name": "generated_note_name_15",
+ "label": {
+ "Bahasa": "Dusun : ${Sub-village}"
+ }
+ },
+ {
+ "bind": {
+ "calculate": "${Village}"
+ },
+ "type": "hidden",
+ "name": "existing_location",
+ "instance": {
+ "openmrs_entity_id": "location_id",
+ "openmrs_entity": "encounter"
+ }
+ },
+ {
+ "bind": {
+ "calculate": "${Province}"
+ },
+ "type": "calculate",
+ "name": "provinsi",
+ "instance": {
+ "openmrs_entity_parent": "usual_residence",
+ "openmrs_entity_id": "stateProvince",
+ "openmrs_entity": "person_address"
+ }
+ },
+ {
+ "bind": {
+ "calculate": "${District}"
+ },
+ "type": "calculate",
+ "name": "kabupaten",
+ "instance": {
+ "openmrs_entity_parent": "usual_residence",
+ "openmrs_entity_id": "countyDistrict",
+ "openmrs_entity": "person_address"
+ }
+ },
+ {
+ "bind": {
+ "calculate": "${Village}"
+ },
+ "type": "calculate",
+ "name": "desa",
+ "instance": {
+ "openmrs_entity_parent": "usual_residence",
+ "openmrs_entity_id": "cityVillage",
+ "openmrs_entity": "person_address"
+ }
+ },
+ {
+ "bind": {
+ "calculate": "${Sub-village}"
+ },
+ "type": "calculate",
+ "name": "dusun",
+ "instance": {
+ "openmrs_entity_parent": "usual_residence",
+ "openmrs_entity_id": "address1",
+ "openmrs_entity": "person_address"
+ }
+ },
+ {
+ "bind": {
+ "calculate": "${Sub-district}"
+ },
+ "type": "calculate",
+ "name": "kecamatan",
+ "instance": {
+ "openmrs_entity_parent": "usual_residence",
+ "openmrs_entity_id": "address2",
+ "openmrs_entity": "person_address"
+ }
+ },
+ {
+ "name": "pasien_wilayah",
+ "bind": {
+ "required": "yes"
+ },
+ "label": {
+ "Bahasa": "Apakah anak adalah sasaran wilayah Anda?",
+ "English": "Is the child living in your catchment area?"
+ },
+ "instance": {
+ "openmrs_entity_id": "160637AAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "concept"
+ },
+ "type": "select one",
+ "children": [
+ {
+ "instance": {
+ "openmrs_code": "160635AAAAAAAAAAAAAAAAAAAAAAAAAA"
+ },
+ "name": "pasien_wilayah_desa",
+ "label": {
+ "Bahasa": "Ya",
+ "English": "Yes"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_code": "160636AAAAAAAAAAAAAAAAAAAAAAAAAA"
+ },
+ "name": "pasien_luar_wilayah",
+ "label": {
+ "Bahasa": "Tidak",
+ "English": "No"
+ }
+ }
+ ]
+ },
+ {
+ "name": "pasien_pindahan",
+ "bind": {
+ "required": "yes"
+ },
+ "label": {
+ "Bahasa": "Apakah anak ini pindahan dari desa lain?",
+ "English": "Is the child moving in to this village?"
+ },
+ "instance": {
+ "openmrs_entity_id": "160563AAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "concept"
+ },
+ "type": "select one",
+ "children": [
+ {
+ "instance": {
+ "openmrs_code": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ },
+ "name": "Yes",
+ "label": {
+ "Bahasa": "Ya",
+ "English": "Yes"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_code": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ },
+ "name": "No",
+ "label": {
+ "Bahasa": "Tidak",
+ "English": "No"
+ }
+ }
+ ]
+ },
+ {
+ "name": "tgl_pindah",
+ "hint": {
+ "Bahasa": "Tuliskan tanggal anak pindah ke desa ini",
+ "English": "Write the date when the mother moved into this village"
+ },
+ "bind": {
+ "relevant": "${pasien_pindahan}='ya'",
+ "required": "yes",
+ "constraint": ".<${today}"
+ },
+ "label": {
+ "Bahasa": "Sejak kapan anak pindah ke sini?",
+ "English": "Since when did she move this village?"
+ },
+ "instance": {
+ "openmrs_entity_id": "160534AAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "concept"
+ },
+ "type": "date"
+ },
+ {
+ "label": {
+ "Bahasa": "Nama Posyandu",
+ "English": "Health Post"
+ },
+ "type": "text",
+ "name": "posyandu",
+ "hint": {
+ "Bahasa": "Nama Pos Pelayanan Terpadu",
+ "English": "Name of Health Post"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "last_name",
+ "openmrs_entity": "person"
+ },
+ "label": {
+ "Bahasa": "Nama Ayah",
+ "English": "Fathr's Name"
+ },
+ "type": "text",
+ "name": "nama_ayah",
+ "hint": {
+ "Bahasa": "Nama Ayah Bayi yang diberikan Imunisasi",
+ "English": "Name of Baby's Father Receiving Immunization"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "first_name",
+ "openmrs_entity": "person"
+ },
+ "label": {
+ "Bahasa": "Nama Ibu",
+ "English": "Mother's Name"
+ },
+ "type": "text",
+ "name": "nama_ibu",
+ "hint": {
+ "Bahasa": "Nama Ibu Bayi yang diberikan Imunisasi",
+ "English": "Name of Baby's Mother Receiving Immunization"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "NoIbu",
+ "openmrs_entity": "person_attribute"
+ },
+ "type": "integer",
+ "name": "no_ibu",
+ "bind": {
+ "required": "yes"
+ },
+ "label": {
+ "Bahasa": "No. Ibu",
+ "English": "Mother's Number"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "nik",
+ "openmrs_entity": "person_identifier"
+ },
+ "label": {
+ "Bahasa": "NIK",
+ "English": "National identification number"
+ },
+ "type": "integer",
+ "name": "nik",
+ "hint": {
+ "Bahasa": "Nomor KTP (Kartu Tanda Penduduk)",
+ "English": "Personal identity number"
+ }
+ },
+ {
+ "default": "0",
+ "instance": {
+ "openmrs_entity_id": "1532AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "concept"
+ },
+ "type": "hidden",
+ "name": "umur",
+ "hint": {
+ "Bahasa": "for sync purpose"
+ }
+ },
+ {
+ "default": "0",
+ "instance": {
+ "openmrs_entity_id": "374AAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "concept"
+ },
+ "type": "hidden",
+ "name": "jenis_kontrasepsi",
+ "hint": {
+ "Bahasa": "for sync purpose"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "Child Registration",
+ "openmrs_entity": "person"
+ },
+ "type": "repeat",
+ "children": [
+ {
+ "bind": {
+ "calculate": "${Village}"
+ },
+ "type": "calculate",
+ "name": "desa_anak",
+ "instance": {
+ "openmrs_entity_parent": "cityVillage",
+ "openmrs_entity_id": "160632AAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "Concept"
+ }
+ },
+ {
+ "type": "note",
+ "name": "generated_note_name_39",
+ "label": {
+ "Bahasa": "Desa : ${desa_anak}"
+ }
+ },
+ {
+ "type": "note",
+ "name": "generated_note_name_40",
+ "label": {
+ "Bahasa": "Unique ID: ${unique_id}"
+ }
+ },
+ {
+ "bind": {
+ "calculate": "${Village}"
+ },
+ "type": "hidden",
+ "name": "child_existing_location",
+ "instance": {
+ "openmrs_entity_id": "location_id",
+ "openmrs_entity": "encounter"
+ }
+ },
+ {
+ "name": "nama_bayi",
+ "hint": {
+ "Bahasa": "Nama Bayi yang diberikan Imunisasi",
+ "English": "Name of Baby Receiving Immunization"
+ },
+ "bind": {
+ "required": "yes"
+ },
+ "label": {
+ "Bahasa": "Nama Bayi",
+ "English": "Baby's Name"
+ },
+ "instance": {
+ "openmrs_entity_id": "1586AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "Concept"
+ },
+ "type": "text"
+ },
+ {
+ "name": "jenis_kelamin",
+ "hint": {
+ "Bahasa": "Jenis Kelamin Bayi/Balita Yang diberikan Imunisasi",
+ "English": "Gender of Baby Receiving Immunization"
+ },
+ "bind": {
+ "required": "yes"
+ },
+ "label": {
+ "Bahasa": "Jenis Kelamin",
+ "English": "Gender"
+ },
+ "instance": {
+ "openmrs_entity_id": "gender",
+ "openmrs_entity": "person"
+ },
+ "type": "select one",
+ "children": [
+ {
+ "instance": {
+ "openmrs_code": "1534AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ },
+ "name": "male",
+ "label": {
+ "Bahasa": "Laki - laki",
+ "English": "Male"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_code": "1535AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ },
+ "name": "female",
+ "label": {
+ "Bahasa": "Perempuan",
+ "English": "Female"
+ }
+ }
+ ]
+ },
+ {
+ "name": "tanggal_lahir",
+ "hint": {
+ "Bahasa": "Tanggal lahir Bayi",
+ "English": "Baby's date of birth"
+ },
+ "bind": {
+ "required": "yes"
+ },
+ "label": {
+ "Bahasa": "Tanggal lahir",
+ "English": "DOB"
+ },
+ "instance": {
+ "openmrs_entity_id": "birthdate",
+ "openmrs_entity": "person"
+ },
+ "type": "date"
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "5916AAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+ "openmrs_entity": "concept"
+ },
+ "label": {
+ "Bahasa": "Berat badan saat Lahir",
+ "English": "Baby's birth weight"
+ },
+ "type": "integer",
+ "name": "berat_badan_saat_lahir",
+ "hint": {
+ "Bahasa": "Berat badan lahir bayi",
+ "English": "Baby's birth weight"
+ }
+ },
+ {
+ "instance": {
+ "openmrs_entity_id": "ibuCaseId",
+ "openmrs_entity": "person_relationship"
+ },
+ "type": "hidden",
+ "name": "ibu_entity_id"
+ }
+ ],
+ "name": "child_registration"
+ },
+ {
+ "control": {
+ "bodyless": true
+ },
+ "type": "group",
+ "children": [
+ {
+ "bind": {
+ "readonly": "true()",
+ "calculate": "concat('uuid:', uuid())"
+ },
+ "type": "calculate",
+ "name": "instanceID"
+ }
+ ],
+ "name": "meta"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form.xml b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form.xml
new file mode 100644
index 000000000..998f33567
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form.xml
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form_definition.json b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form_definition.json
new file mode 100644
index 000000000..61e4fab41
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/form_definition.json
@@ -0,0 +1,172 @@
+{
+ "form_data_definition_version": "3",
+ "form": {
+ "bind_type": "kartu_ibu",
+ "ec_bind_type": "ec_kartu_ibu",
+ "default_bind_path": "/model/instance/Registrasi_Sdidtk/",
+ "fields": [
+ {
+ "name": "id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "pasienWilayah",
+ "bind": "/model/instance/Registrasi_Sdidtk/pasien_wilayah",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "pasienPindahan",
+ "bind": "/model/instance/Registrasi_Sdidtk/pasien_pindahan",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "tglPindah",
+ "bind": "/model/instance/Registrasi_Sdidtk/tgl_pindah",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "noIbu",
+ "bind": "/model/instance/Registrasi_Sdidtk/no_ibu"
+ },
+ {
+ "name": "existing_location",
+ "bind": "/model/instance/Registrasi_Sdidtk/existing_location",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Village",
+ "bind": "/model/instance/Registrasi_Sdidtk/Village",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Province",
+ "bind": "/model/instance/Registrasi_Sdidtk/Province",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Sub-district",
+ "bind": "/model/instance/Registrasi_Sdidtk/Sub-district",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_District",
+ "bind": "/model/instance/Registrasi_Sdidtk/District",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "existing_Sub-village",
+ "bind": "/model/instance/Registrasi_Sdidtk/Sub-village",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "provinsi",
+ "bind": "/model/instance/Registrasi_Sdidtk/provinsi",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "kabupaten",
+ "bind": "/model/instance/Registrasi_Sdidtk/kabupaten",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "kecamatan",
+ "bind": "/model/instance/Registrasi_Sdidtk/kecamatan",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "desa",
+ "bind": "/model/instance/Registrasi_Sdidtk/desa",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "dusun",
+ "bind": "/model/instance/Registrasi_Sdidtk/dusun",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "posyandu",
+ "bind": "/model/instance/Registrasi_Sdidtk/posyandu"
+ },
+ {
+ "name": "namaSuami",
+ "bind": "/model/instance/Registrasi_Sdidtk/nama_ayah"
+ },
+ {
+ "name": "namalengkap",
+ "bind": "/model/instance/Registrasi_Sdidtk/nama_ibu"
+ },
+ {
+ "name": "nik",
+ "bind": "/model/instance/Registrasi_Sdidtk/nik"
+ },
+ {
+ "name": "jenisKontrasepsi",
+ "bind": "/model/instance/Registrasi_Sdidtk/jenis_kontrasepsi"
+ },
+ {
+ "name": "isOutOfArea",
+ "value": "false"
+ },
+ {
+ "name": "submissionDate",
+ "bind": "/model/instance/Registrasi_Sdidtk/today"
+ }
+ ],
+ "sub_forms": [
+ {
+ "name": "child_registration",
+ "bind_type": "anak",
+ "ec_bind_type": "ec_anak",
+ "default_bind_path": "/model/instance/Registrasi_Sdidtk/child_registration/",
+ "fields": [
+ {
+ "name": "id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "relationalid",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "injectedBaseEntityId",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "ibu_entity_id",
+ "source": "kartu_ibu.id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "unique_id",
+ "bind": "/model/instance/Registrasi_Sdidtk/unique_id",
+ "shouldLoadValue": true
+ },
+ {
+ "name": "namaBayi",
+ "bind": "/model/instance/Registrasi_Sdidtk/child_registration/nama_bayi"
+ },
+ {
+ "name": "jenisKelamin",
+ "bind": "/model/instance/Registrasi_Sdidtk/child_registration/jenis_kelamin"
+ },
+ {
+ "name": "desa_anak",
+ "bind": "/model/instance/Registrasi_Sdidtk/child_registration/desa_anak"
+ },
+ {
+ "name": "child_existing_location",
+ "bind": "/model/instance/Registrasi_Sdidtk/child_registration/child_existing_location"
+ },
+ {
+ "name": "tanggalLahirAnak",
+ "bind": "/model/instance/Registrasi_Sdidtk/child_registration/tanggal_lahir"
+ },
+ {
+ "name": "beratLahir",
+ "bind": "/model/instance/Registrasi_Sdidtk/child_registration/birthweight"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/model.xml b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/model.xml
new file mode 100644
index 000000000..36b905ebb
--- /dev/null
+++ b/opensrp-sdidtk/src/main/assets/www/form/registrasi_sdidtk/model.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartClientsProvider.java b/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartClientsProvider.java
index 34f1de596..a2d66ac39 100644
--- a/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartClientsProvider.java
+++ b/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartClientsProvider.java
@@ -77,8 +77,8 @@ public void getView(SmartRegisterClient smartRegisterClient, View convertView) {
viewHolder.umur = (TextView)convertView.findViewById(R.id.text_umur);
viewHolder.nama_ibu = (TextView)convertView.findViewById(R.id.text_nama_ibu);
- //kpsp
- viewHolder.tgl_kpsp = (TextView)convertView.findViewById(R.id.text_kpsp_test_date);
+ //antro
+ viewHolder.anthropometry_date = (TextView)convertView.findViewById(R.id.text_anthropometry_date);
viewHolder.berat = (TextView)convertView.findViewById(R.id.text_berat);
viewHolder.tinggi = (TextView)convertView.findViewById(R.id.text_tinggi);
viewHolder.lingkar_kepala = (TextView)convertView.findViewById(R.id.text_lingkar_kepala);
@@ -171,12 +171,12 @@ else if(pc.getDetails().get("gender") != null && pc.getDetails().get("gender").e
- /* viewHolder.berat.setText("Berat: "+ (pc.getDetails().get("berat")!=null?pc.getDetails().get("berat").replaceAll("_", " "):"-"));
+ viewHolder.berat.setText("Berat: "+ (pc.getDetails().get("berat")!=null?pc.getDetails().get("berat").replaceAll("_", " "):"-"));
viewHolder.tinggi.setText("Tinggi: "+ (pc.getDetails().get("tinggi") != null ? pc.getDetails().get("tinggi").replaceAll("_", " ") : "-"));
viewHolder.lingkar_kepala.setText("Lingkar Kepala: "+ (pc.getDetails().get("lingkar_kepala")!=null?pc.getDetails().get("lingkar_kepala").replaceAll("_", " "):"-"));
- viewHolder.kpsp_test_date1.setText("Tanggal: "+ (pc.getDetails().get("kpsp_test_date1")!=null?pc.getDetails().get("kpsp_test_date1").replaceAll("_", " "):"-"));
-
+ viewHolder.anthropometry_date.setText("Tanggal: "+ (pc.getDetails().get("anthropometry_date")!=null?pc.getDetails().get("anthropometry_date").replaceAll("_", " "):"-"));
+/*
viewHolder.kpsp_test_date2.setText(pc.getDetails().get("kpsp_test_date2")!=null?pc.getDetails().get("kpsp_test_date2").replaceAll("_", " "):"-");
viewHolder.status_kembang2.setText(pc.getDetails().get("status_kembang2")!=null?pc.getDetails().get("status_kembang2").replaceAll("_", " "):"-");
viewHolder.kpsp_test_date3.setText(pc.getDetails().get("kpsp_test_date3")!=null?pc.getDetails().get("kpsp_test_date3").replaceAll("_", " "):"-");
diff --git a/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartRegisterActivity.java b/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartRegisterActivity.java
index d59f32bdf..1039c7304 100644
--- a/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartRegisterActivity.java
+++ b/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/ddtk/FormulirDdtkSmartRegisterActivity.java
@@ -14,22 +14,30 @@
import org.ei.opensrp.ddtk.fragment.FormulirDdtkSmartRegisterFragment;
import org.ei.opensrp.ddtk.pageradapter.BaseRegisterActivityPagerAdapter;
import org.ei.opensrp.domain.Alert;
+import org.ei.opensrp.domain.form.FieldOverrides;
import org.ei.opensrp.domain.form.FormSubmission;
import org.ei.opensrp.provider.SmartRegisterClientsProvider;
import org.ei.opensrp.service.ZiggyService;
import org.ei.opensrp.ddtk.R;
//import org.ei.opensrp.test.fragment.HouseHoldSmartRegisterFragment;
+import org.ei.opensrp.sync.ClientProcessor;
import org.ei.opensrp.util.FormUtils;
import org.ei.opensrp.view.activity.SecuredNativeSmartRegisterActivity;
import org.ei.opensrp.view.dialog.DialogOption;
+import org.ei.opensrp.view.dialog.LocationSelectorDialogFragment;
import org.ei.opensrp.view.dialog.OpenFormOption;
import org.ei.opensrp.view.fragment.DisplayFormFragment;
import org.ei.opensrp.view.fragment.SecuredNativeSmartRegisterFragment;
import org.ei.opensrp.view.viewpager.OpenSRPViewPager;
+import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import butterknife.Bind;
import butterknife.ButterKnife;
@@ -39,7 +47,9 @@
import static org.ei.opensrp.R.string.no_button_label;
import static org.ei.opensrp.R.string.yes_button_label;
-public class FormulirDdtkSmartRegisterActivity extends SecuredNativeSmartRegisterActivity {
+public class FormulirDdtkSmartRegisterActivity extends SecuredNativeSmartRegisterActivity implements
+ LocationSelectorDialogFragment.OnLocationSelectedListener{
+
public static final String TAG = "TestActivity";
@Bind(R.id.view_pager)
@@ -123,7 +133,32 @@ public DialogOption[] getEditOptions() {
};
}
+ @Override
+ public void OnLocationSelected(String locationJSONString) {
+ JSONObject combined = null;
+
+ try {
+ JSONObject locationJSON = new JSONObject(locationJSONString);
+ // JSONObject uniqueId = new JSONObject(LoginActivity.generator.uniqueIdController().getUniqueIdJson());
+
+ combined = locationJSON;
+ // Iterator
iter = uniqueId.keys();
+
+ // while (iter.hasNext()) {
+ // String key = iter.next();
+ // combined.put(key, uniqueId.get(key));
+ // }
+ // System.out.println("injection string: " + combined.toString());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+
+ if (combined != null) {
+ FieldOverrides fieldOverrides = new FieldOverrides(combined.toString());
+ startFormActivity("registrasi_sdidtk", null, fieldOverrides.getJSONString());
+ }
+ }
private String getalertstateforcensus(CommonPersonObjectClient pc) {
try {
List alertlist_for_client = Context.getInstance().alertService().findByEntityIdAndAlertNames(pc.entityId(), "FW CENSUS");
@@ -151,8 +186,11 @@ public void saveFormSubmission(String formSubmission, String id, String formName
try{
FormUtils formUtils = FormUtils.getInstance(getApplicationContext());
FormSubmission submission = formUtils.generateFormSubmisionFromXMLString(id, formSubmission, formName, fieldOverrides);
-
ziggyService.saveForm(getParams(submission), submission.instance());
+ ClientProcessor.getInstance(getApplicationContext()).processClient();
+
+ context().formSubmissionService().updateFTSsearch(submission);
+ context().formSubmissionRouter().handleSubmission(submission, formName);
//switch to forms list fragment
switchToBaseFragment(formSubmission); // Unnecessary!! passing on data
@@ -169,7 +207,7 @@ public void saveFormSubmission(String formSubmission, String id, String formName
@Override
public void startFormActivity(String formName, String entityId, String metaData) {
- // Log.v("fieldoverride", metaData);
+
try {
int formIndex = FormUtils.getIndexForFormName(formName, formNames) + 1; // add the offset
if (entityId != null || metaData != null){
@@ -183,7 +221,6 @@ public void startFormActivity(String formName, String entityId, String metaData)
DisplayFormFragment displayFormFragment = getDisplayFormFragmentAtIndex(formIndex);
if (displayFormFragment != null) {
displayFormFragment.setFormData(data);
- // displayFormFragment.loadFormData();
displayFormFragment.setRecordId(entityId);
displayFormFragment.setFieldOverides(metaData);
}
@@ -280,8 +317,8 @@ public void onClick(DialogInterface dialog,
private String[] buildFormNameList(){
List formNames = new ArrayList();
-
- formNames.add("formulir_ddtk");
+ formNames.add("registrasi_gizi");
+ formNames.add("registrasi_sdidtk");
formNames.add("antropometri");
formNames.add("kpsp_bayi_1thn");
formNames.add("kpsp_balita_2thn");
diff --git a/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/fragment/FormulirDdtkSmartRegisterFragment.java b/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/fragment/FormulirDdtkSmartRegisterFragment.java
index ccebf8406..2d779359f 100644
--- a/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/fragment/FormulirDdtkSmartRegisterFragment.java
+++ b/opensrp-sdidtk/src/main/java/org/ei/opensrp/ddtk/fragment/FormulirDdtkSmartRegisterFragment.java
@@ -257,7 +257,7 @@ public void startRegistration() {
//<<<<<<< HEAD
// .newInstance((GiziSmartRegisterActivity) getActivity(), new EditDialogOptionModel(), context.anmLocationController().get(), "registrasi_gizi")
//=======
- .newInstance((FormulirDdtkSmartRegisterActivity) getActivity(), new EditDialogOptionModel(), context().anmLocationController().get(), "registrasi_gizi")
+ .newInstance((FormulirDdtkSmartRegisterActivity) getActivity(), new EditDialogOptionModel(), context().anmLocationController().get(), "registrasi_sdidtk")
//>>>>>>> a226fad729247ae36c3882a71e1d3f15be4ade8a
.show(ft, locationDialogTAG);
}