Sync practitioners of a role to device

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=4.2.13-gs.1-SNAPSHOT
+VERSION_NAME=4.2.13-gs.2-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application

opensrp-app/build.gradle

@@ -89,8 +89,8 @@ android {
         //applicationId "org.smartregister"
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode Integer.parseInt(project.VERSION_CODE)
-        versionName project.VERSION_NAME
+        /*versionCode Integer.parseInt(project.VERSION_CODE)
+        versionName project.VERSION_NAME*/
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
         buildConfigField "int", "DB_ENCRYPTION_VERSION", '1'
@@ -230,7 +230,7 @@ dependencies {
         transitive = true
     }
 
-    implementation 'org.smartregister:opensrp-plan-evaluator:1.3.1-SNAPSHOT'
+    implementation 'org.smartregister:opensrp-plan-evaluator:1.4.0-SNAPSHOT'
 
     implementation 'xerces:xercesImpl:2.12.0'
 
@@ -312,4 +312,4 @@ coveralls {
     sourceDirs = ["$project.projectDir/src/main/java"]
 }
 
-apply from: '../maven.gradle'
+//apply from: '../maven.gradle'

opensrp-app/src/main/java/org/smartregister/Context.java

@@ -43,6 +43,7 @@
 import org.smartregister.repository.ManifestRepository;
 import org.smartregister.repository.MotherRepository;
 import org.smartregister.repository.PlanDefinitionRepository;
+import org.smartregister.repository.PractitionerRepository;
 import org.smartregister.repository.ReportRepository;
 import org.smartregister.repository.ServiceProvidedRepository;
 import org.smartregister.repository.SettingsRepository;
@@ -227,6 +228,7 @@ public class Context {
     private AppProperties appProperties;
     private LocationTagRepository locationTagRepository;
     private ManifestRepository manifestRepository;
+    private PractitionerRepository practitionerRepository;
     private ClientFormRepository clientFormRepository;
     private ClientRelationshipRepository clientRelationshipRepository;
 
@@ -1245,6 +1247,13 @@ public ClientFormRepository getClientFormRepository() {
         return clientFormRepository;
     }
 
+    public PractitionerRepository getPractitionerRepository() {
+        if (practitionerRepository == null) {
+            practitionerRepository = new PractitionerRepository();
+        }
+        return practitionerRepository;
+    }
+
     public ClientRelationshipRepository getClientRelationshipRepository() {
         if (clientRelationshipRepository == null) {
             clientRelationshipRepository = new ClientRelationshipRepository();

opensrp-app/src/main/java/org/smartregister/configuration/BottomNavigationOptions.java

@@ -0,0 +1,10 @@
+package org.smartregister.configuration;
+
+public interface BottomNavigationOptions {
+
+    public int getBottomNavigationLayoutId();
+
+    public BottomNavigationOptionsModel getBottomNavigationOptionsModel();
+
+    public int checkedItemId();
+}

opensrp-app/src/main/java/org/smartregister/configuration/BottomNavigationOptionsModel.java

@@ -0,0 +1,11 @@
+package org.smartregister.configuration;
+
+import android.app.Activity;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+
+public interface BottomNavigationOptionsModel {
+
+    void onBottomOptionSelection(Activity activity, @NonNull MenuItem menuItem);
+}

opensrp-app/src/main/java/org/smartregister/configuration/ConfigurableNavigationOptions.java

@@ -0,0 +1,9 @@
+package org.smartregister.configuration;
+
+public interface ConfigurableNavigationOptions {
+
+    public ToolbarOptions getToolbarOptions();
+
+    public BottomNavigationOptions getBottomNavigationOptions();
+
+}

opensrp-app/src/main/java/org/smartregister/configuration/ModuleConfiguration.java

@@ -83,8 +83,8 @@ public String getRegisterTitle() {
         return builder.registerTitle;
     }
 
-    public Class<? extends ToolbarOptions> getToolbarOptions() {
-        return builder.toolbarOptions;
+    public Class<? extends ConfigurableNavigationOptions> getNavigationOptions() {
+        return builder.navigationOptions;
     }
 
     public int getMaxCheckInDurationInMinutes() {
@@ -127,7 +127,7 @@ public static class Builder {
         @NonNull
         private Class<? extends ClientFormContract.View> jsonFormActivity;
 
-        private Class<? extends ToolbarOptions> toolbarOptions;
+        private Class<? extends ConfigurableNavigationOptions> navigationOptions;
 
         private boolean isBottomNavigationEnabled;
 
@@ -163,8 +163,8 @@ public Builder setModuleMetadata(@NonNull ModuleMetadata moduleMetadata) {
             return this;
         }
 
-        public Builder setToolbarOptions(@Nullable Class<? extends ToolbarOptions> toolbarOptions) {
-            this.toolbarOptions = toolbarOptions;
+        public Builder setNavigationOptions(@Nullable Class<? extends ConfigurableNavigationOptions> navigationOptions) {
+            this.navigationOptions = navigationOptions;
             return this;
         }
 

opensrp-app/src/main/java/org/smartregister/configuration/ToolbarOptions.java

@@ -2,16 +2,27 @@
 
 import org.smartregister.view.dialog.DialogOptionModel;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public interface ToolbarOptions {
 
     public int getLogoResourceId();
 
+    default int getToolBarColor() {
+        return 0;
+    }
+
     public int getFabTextStringResource();
 
     public boolean isFabEnabled();
 
     public boolean isNewToolbarEnabled();
 
+    default List<Integer> getHiddenToolOptions() {
+        return new ArrayList<>();
+    }
+
     public DialogOptionModel getDialogOptionModel();
 
 }

opensrp-app/src/main/java/org/smartregister/job/SyncPractitionersByIdAndRoleJob.java

@@ -0,0 +1,21 @@
+package org.smartregister.job;
+
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+
+import org.smartregister.AllConstants;
+import org.smartregister.sync.intent.SyncChwPractitionersByIdAndRoleIntentService;
+
+public class SyncPractitionersByIdAndRoleJob extends BaseJob {
+
+    public static final String TAG = "SyncPractitionersByIdAndRoleJob";
+
+    @NonNull
+    @Override
+    protected Result onRunJob(@NonNull Params params) {
+        Intent intent = new Intent(getApplicationContext(), SyncChwPractitionersByIdAndRoleIntentService.class);
+        getApplicationContext().startService(intent);
+        return params != null && params.getExtras().getBoolean(AllConstants.INTENT_KEY.TO_RESCHEDULE, false) ? Result.RESCHEDULE : Result.SUCCESS;
+    }
+}

opensrp-app/src/main/java/org/smartregister/listener/BottomNavigationListener.java

@@ -1,15 +1,17 @@
 package org.smartregister.listener;
 
 import android.app.Activity;
+import android.view.MenuItem;
+
 import androidx.annotation.NonNull;
+
 import com.google.android.material.bottomnavigation.BottomNavigationView;
-import android.view.MenuItem;
 
 import org.smartregister.R;
 import org.smartregister.view.activity.BaseRegisterActivity;
 
 public class BottomNavigationListener implements BottomNavigationView.OnNavigationItemSelectedListener {
-    private Activity context;
+    protected Activity context;
 
     public BottomNavigationListener(Activity context) {
         this.context = context;

opensrp-app/src/main/java/org/smartregister/listener/ConfigurableBottomNavigationListener.java

@@ -0,0 +1,25 @@
+package org.smartregister.listener;
+
+import android.app.Activity;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+
+import org.smartregister.configuration.BottomNavigationOptionsModel;
+
+public class ConfigurableBottomNavigationListener extends BottomNavigationListener {
+
+    private BottomNavigationOptionsModel bottomNavigationOptionsModel;
+
+    public ConfigurableBottomNavigationListener(Activity context, BottomNavigationOptionsModel model) {
+        super(context);
+        this.bottomNavigationOptionsModel = model;
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
+        bottomNavigationOptionsModel.onBottomOptionSelection(context, menuItem);
+        return true;
+    }
+
+}

opensrp-app/src/main/java/org/smartregister/login/task/RemoteLoginTask.java

@@ -21,6 +21,8 @@
 import org.smartregister.account.AccountHelper;
 import org.smartregister.account.AccountResponse;
 import org.smartregister.domain.LoginResponse;
+import org.smartregister.domain.Practitioner;
+import org.smartregister.domain.PractitionerRole;
 import org.smartregister.domain.jsonmapping.User;
 import org.smartregister.event.Listener;
 import org.smartregister.sync.helper.SyncSettingsServiceHelper;
@@ -140,6 +142,11 @@ protected LoginResponse doInBackground(Void... params) {
                         }
 
                     }
+
+                    // Save the registered ANM
+                    getOpenSRPContext().allSharedPreferences().updateANMUserName(mUsername);
+
+                    fetchUserRole();
                 } else {
                     if (response.getAccountError() != null && response.getAccountError().getError() != null) {
                         return LoginResponse.valueOf(response.getAccountError().getError().toUpperCase(Locale.ENGLISH));
@@ -162,6 +169,37 @@ protected LoginResponse doInBackground(Void... params) {
         return loginResponse;
     }
 
+    protected void fetchUserRole() {
+        Practitioner[] practitioners = getOpenSRPContext().httpAgent().fetchPractitioners();
+        PractitionerRole[] practitionerRoles = getOpenSRPContext().httpAgent().fetchPractitionerRoles();
+
+        if (practitioners == null) {
+            return;
+        }
+
+        Practitioner loggedInPractitioner = null;
+        for (Practitioner practitioner : practitioners) {
+            if (practitioner != null && mUsername.equals(practitioner.getUsername())) {
+                loggedInPractitioner = practitioner;
+            }
+        }
+
+        if (loggedInPractitioner != null && practitionerRoles != null) {
+
+            PractitionerRole loggedInPractitionerRole = null;
+            for (PractitionerRole practitionerRole : practitionerRoles) {
+                if (loggedInPractitioner.getIdentifier().equals(practitionerRole.getPractitionerIdentifier())) {
+                    loggedInPractitionerRole = practitionerRole;
+                }
+            }
+
+            if (loggedInPractitionerRole != null) {
+                getOpenSRPContext().allSharedPreferences().setUserPractitionerRole(loggedInPractitionerRole.getCode().getText());
+                getOpenSRPContext().allSharedPreferences().setUserPractitionerIdentifier(loggedInPractitionerRole.getPractitionerIdentifier());
+            }
+        }
+    }
+
     @Override
     protected void onProgressUpdate(Integer... messageIdentifier) {
         mLoginView.updateProgressMessage(getOpenSRPContext().applicationContext().getString(messageIdentifier[0]));

opensrp-app/src/main/java/org/smartregister/repository/AllSharedPreferences.java

@@ -2,8 +2,8 @@
 
 import android.content.SharedPreferences;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
 import org.smartregister.AllConstants;
@@ -33,6 +33,8 @@ public class AllSharedPreferences {
     public static final String FORMS_VERSION = "FORMS_VERSION";
     private static final String ENCRYPTED_PASSPHRASE_KEY = "ENCRYPTED_PASSPHRASE_KEY";
     private static final String DB_ENCRYPTION_VERSION = "DB_ENCRYPTION_VERSION";
+    private static final String USER_PRACTITIONER_ROLE = "USER_PRACTITIONER_ROLE";
+    private static final String USER_PRACTITIONER_IDENTIFIER = "USER_PRACTITIONER_IDENTIFIER";
     private SharedPreferences preferences;
 
     public AllSharedPreferences(SharedPreferences preferences) {
@@ -385,5 +387,24 @@ public int getDBEncryptionVersion() {
     public void setDBEncryptionVersion(int encryptionVersion) {
         preferences.edit().putInt(DB_ENCRYPTION_VERSION, encryptionVersion).commit();
     }
+
+    @Nullable
+    public String getUserPractitionerRole() {
+        return preferences.getString(USER_PRACTITIONER_ROLE, null);
+    }
+
+    @Nullable
+    public String getUserPractitionerIdentifier() {
+        return preferences.getString(USER_PRACTITIONER_IDENTIFIER, null);
+    }
+
+    public void setUserPractitionerRole(String practitionerRole) {
+        preferences.edit().putString(USER_PRACTITIONER_ROLE, practitionerRole).commit();
+    }
+
+    public void setUserPractitionerIdentifier(String identifier) {
+        preferences.edit().putString(USER_PRACTITIONER_IDENTIFIER, identifier).commit();
+
+    }
 }