Skip to content

Commit

Permalink
refactoring code for better support for localization
Browse files Browse the repository at this point in the history 
initial commit for extracting resources for all hard coded strings
  • Loading branch information
@LuGO0
LuGO0 committed Apr 16, 2020
1 parent 114b011 commit c6b0f0e
Show file tree
Hide file tree
Showing 32 changed files with 376 additions and 273 deletions.
214 changes: 98 additions & 116 deletions openmrs-client/schemas/org.openmrs.mobile.databases.AppDatabase/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,12 @@
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "f2ba83e78fa9d0190a4a24b5be11b2de",
"identityHash": "2ca31877683087a2cef9a670e3bed3be",
"entities": [
{
"tableName": "concepts",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `display` TEXT, `id` INTEGER, `name` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `datatype_uuid` TEXT, `datatype_display` TEXT, `datatype__id` INTEGER, `conceptClass_uuid` TEXT, `conceptClass_display` TEXT, `conceptClass__id` INTEGER)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER, `name` TEXT, `uuid` TEXT, `display` TEXT NOT NULL, `_id` INTEGER, `datatype_uuid` TEXT, `datatype_display` TEXT, `datatype__id` INTEGER, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "id",
"columnName": "id",
Expand All @@ -33,73 +21,55 @@
"notNull": false
},
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "datatype.uuid",
"columnName": "datatype_uuid",
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "datatype.display",
"columnName": "datatype_display",
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": false
"notNull": true
},
{
"fieldPath": "datatype.id",
"columnName": "datatype__id",
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "conceptClass.uuid",
"columnName": "conceptClass_uuid",
"fieldPath": "datatype.uuid",
"columnName": "datatype_uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "conceptClass.display",
"columnName": "conceptClass_display",
"fieldPath": "datatype.display",
"columnName": "datatype_display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "conceptClass.id",
"columnName": "conceptClass__id",
"fieldPath": "datatype.id",
"columnName": "datatype__id",
"affinity": "INTEGER",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"_id"
"id"
],
"autoGenerate": true
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "encounters",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `display` TEXT, `visit_id` TEXT, `encounterDatetime` TEXT NOT NULL, `type` TEXT, `patient_uuid` TEXT, `form_uuid` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`visit_id` TEXT, `encounterDatetime` TEXT NOT NULL, `type` TEXT, `patient_uuid` TEXT, `form_uuid` TEXT, `uuid` TEXT, `display` TEXT NOT NULL, `_id` INTEGER PRIMARY KEY AUTOINCREMENT)",
"fields": [
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "visitKeyId",
"columnName": "visit_id",
Expand Down Expand Up @@ -130,11 +100,23 @@
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
"notNull": false
}
],
"primaryKey": {
Expand All @@ -148,20 +130,8 @@
},
{
"tableName": "locations",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `display` TEXT, `name` TEXT, `description` TEXT NOT NULL, `address1` TEXT, `address2` TEXT, `city` TEXT, `state` TEXT, `country` TEXT, `postalCode` TEXT, `parentLocationUuid` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT, `description` TEXT NOT NULL, `address1` TEXT, `address2` TEXT, `city` TEXT, `state` TEXT, `country` TEXT, `postalCode` TEXT, `parentLocationUuid` TEXT, `uuid` TEXT, `display` TEXT NOT NULL, `_id` INTEGER PRIMARY KEY AUTOINCREMENT)",
"fields": [
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
Expand Down Expand Up @@ -216,11 +186,23 @@
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
"notNull": false
}
],
"primaryKey": {
Expand All @@ -234,20 +216,8 @@
},
{
"tableName": "observations",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `display` TEXT, `encounter_id` INTEGER NOT NULL, `displayValue` TEXT, `diagnosisOrder` TEXT, `diagnosisList` TEXT, `diagnosisCertainty` TEXT, `diagnosisNote` TEXT, `conceptUuid` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`encounter_id` INTEGER NOT NULL, `displayValue` TEXT, `diagnosisOrder` TEXT, `diagnosisList` TEXT, `diagnosisCertainty` TEXT, `diagnosisNote` TEXT, `conceptUuid` TEXT, `uuid` TEXT, `display` TEXT NOT NULL, `_id` INTEGER PRIMARY KEY AUTOINCREMENT)",
"fields": [
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "encounterKeyID",
"columnName": "encounter_id",
Expand Down Expand Up @@ -290,11 +260,23 @@
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
"notNull": false
}
],
"primaryKey": {
Expand All @@ -308,20 +290,8 @@
},
{
"tableName": "patients",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `display` TEXT, `synced` INTEGER NOT NULL, `identifier` TEXT, `givenName` TEXT, `middleName` TEXT, `familyName` TEXT, `gender` TEXT, `birthDate` TEXT, `deathDate` TEXT, `causeOfDeath` TEXT, `age` TEXT, `photo` TEXT, `address1` TEXT, `address2` TEXT, `city` TEXT, `state` TEXT, `country` TEXT, `postalCode` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `patient_uuid` TEXT, `patient_display` TEXT, `patient_visit_id` TEXT, `patient_encounterDatetime` TEXT, `patient_type` TEXT, `patient_patient_uuid` TEXT, `patient_form_uuid` TEXT, `patient__id` INTEGER)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`synced` INTEGER NOT NULL, `identifier` TEXT, `givenName` TEXT, `middleName` TEXT, `familyName` TEXT, `gender` TEXT, `birthDate` TEXT, `deathDate` TEXT, `causeOfDeath` TEXT, `age` TEXT, `photo` TEXT, `address1` TEXT, `address2` TEXT, `city` TEXT, `state` TEXT, `country` TEXT, `postalCode` TEXT, `uuid` TEXT, `display` TEXT NOT NULL, `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `patient_visit_id` TEXT, `patient_encounterDatetime` TEXT, `patient_type` TEXT, `patient_patient_uuid` TEXT, `patient_form_uuid` TEXT, `patient_uuid` TEXT, `patient_display` TEXT, `patient__id` INTEGER)",
"fields": [
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "synced",
"columnName": "synced",
Expand Down Expand Up @@ -425,21 +395,21 @@
"notNull": false
},
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "encounters.uuid",
"columnName": "patient_uuid",
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "encounters.display",
"columnName": "patient_display",
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": false
},
{
Expand Down Expand Up @@ -472,6 +442,18 @@
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "encounters.uuid",
"columnName": "patient_uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "encounters.display",
"columnName": "patient_display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "encounters.id",
"columnName": "patient__id",
Expand All @@ -490,20 +472,8 @@
},
{
"tableName": "visits",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `display` TEXT, `patient_id` INTEGER NOT NULL, `visit_type` TEXT, `visit_place` TEXT, `start_date` INTEGER NOT NULL, `stop_date` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`patient_id` INTEGER NOT NULL, `visit_type` TEXT, `visit_place` TEXT, `start_date` TEXT NOT NULL, `stop_date` TEXT, `uuid` TEXT, `display` TEXT NOT NULL, `_id` INTEGER PRIMARY KEY AUTOINCREMENT)",
"fields": [
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "patientKeyID",
"columnName": "patient_id",
Expand All @@ -525,7 +495,7 @@
{
"fieldPath": "startDate",
"columnName": "start_date",
"affinity": "INTEGER",
"affinity": "TEXT",
"notNull": true
},
{
Expand All @@ -534,11 +504,23 @@
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "uuid",
"columnName": "uuid",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "display",
"columnName": "display",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "_id",
"affinity": "INTEGER",
"notNull": true
"notNull": false
}
],
"primaryKey": {
Expand All @@ -554,7 +536,7 @@
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"f2ba83e78fa9d0190a4a24b5be11b2de\")"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"2ca31877683087a2cef9a670e3bed3be\")"
]
}
}
Loading

0 comments on commit c6b0f0e

Please sign in to comment.