Skip to content

Feature new cnm hc design - #1839

Open
manuelplazaspalacio wants to merge 45 commits into
developmentfrom
feature-new_cnm_hc_design
Open

manuelplazaspalacio wants to merge 45 commits into
developmentfrom
feature-new_cnm_hc_design

Conversation

@manuelplazaspalacio

@manuelplazaspalacio manuelplazaspalacio commented Feb 21, 2018

Copy link
Copy Markdown
Contributor

Closes #1819

… in it with relations and added relations to csvs.
…issue_stock_surveys

# Conflicts:
#	app/src/cnm/res/values-km/strings.xml
#	app/src/cnm/res/values/strings.xml
…_pr_in_development

# Conflicts:
#	app/src/cnm/res/values-km/strings.xml
#	app/src/cnm/res/values/donottranslate.xml
#	app/src/cnm/res/values/strings.xml
#	app/src/main/java/org/eyeseetea/malariacare/data/database/datasources/SurveyLocalDataSource.java
#	app/src/main/java/org/eyeseetea/malariacare/domain/boundary/repositories/ISurveyRepository.java
#	app/src/main/java/org/eyeseetea/malariacare/domain/entity/Question.java
…_in_development

# Conflicts:
#	app/src/cnm/assets/Options.csv
#	app/src/cnm/res/values-km/strings.xml
#	app/src/cnm/res/values/strings.xml
…rge_cnm_pr_in_development

# Conflicts:
#	app/src/cnm/res/values-km/strings.xml
#	app/src/cnm/res/values/strings.xml
…nm_pr_in_development

# Conflicts:
#	app/src/main/java/org/eyeseetea/malariacare/data/database/utils/populatedb/PopulateRow.java
@ifoche

ifoche commented Feb 26, 2018

Copy link
Copy Markdown
Member

@manuelplazaspalacio I've just shared the new stock design with you. Sorry for the huge delay

# Conflicts:
#	app/src/cnm/java/org/eyeseetea/malariacare/strategies/SplashActivityStrategy.java
#	app/src/cnm/java/org/eyeseetea/malariacare/views/question/multiquestion/OuTreeMultiQuestionView.java
#	app/src/ereferrals/java/org/eyeseetea/malariacare/utils/ConnectivityStatus.java
#	app/src/main/java/org/eyeseetea/malariacare/domain/entity/Question.java
#	app/src/main/java/org/eyeseetea/malariacare/domain/entity/Survey.java
#	app/src/main/java/org/eyeseetea/malariacare/network/ConnectivityStatus.java
#	app/src/main/java/org/eyeseetea/malariacare/utils/ConnectivityStatus.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants