-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from OpenSRP/new_dashboard
New dashboard
- Loading branch information
Showing
69 changed files
with
3,711 additions
and
390 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 0 additions & 74 deletions
74
opensrp-brac-hnpp/src/main/java/org/smartregister/brac/hnpp/activity/DashBoardActivity.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 135 additions & 0 deletions
135
...rp-brac-hnpp/src/main/java/org/smartregister/brac/hnpp/activity/NewDashBoardActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| package org.smartregister.brac.hnpp.activity; | ||
|
|
||
| import android.os.Handler; | ||
| import android.support.design.widget.TabLayout; | ||
| import android.support.v4.app.FragmentManager; | ||
| import android.support.v4.app.FragmentTransaction; | ||
| import android.view.View; | ||
| import android.widget.ImageView; | ||
| import android.widget.ProgressBar; | ||
| import android.widget.TextView; | ||
|
|
||
| import com.github.ybq.android.spinkit.style.FadingCircle; | ||
|
|
||
| import org.smartregister.brac.hnpp.R; | ||
| import org.smartregister.brac.hnpp.fragment.BaseDashBoardFragment; | ||
| import org.smartregister.brac.hnpp.fragment.CountSummeryDashBoardFragment; | ||
| import org.smartregister.brac.hnpp.fragment.DailyServiceTargetAchievementFragment; | ||
| import org.smartregister.brac.hnpp.fragment.DailyTargetAchievementFragment; | ||
| import org.smartregister.brac.hnpp.fragment.ForumTargetAchievementFragment; | ||
| import org.smartregister.brac.hnpp.fragment.MonthlyServiceTargetAchievementFragment; | ||
| import org.smartregister.brac.hnpp.fragment.MonthlyTargetAchievementFragment; | ||
| import org.smartregister.brac.hnpp.fragment.WorkSummeryDashBoardFragment; | ||
| import org.smartregister.brac.hnpp.utils.HnppConstants; | ||
| import org.smartregister.view.activity.SecuredActivity; | ||
|
|
||
| public class NewDashBoardActivity extends SecuredActivity { | ||
| private ImageView refreshIndicatorsIcon; | ||
| private ProgressBar refreshIndicatorsProgressBar; | ||
| private TextView titleText; | ||
| private BaseDashBoardFragment dashBoardFragment; | ||
| private TabLayout tabs; | ||
|
|
||
| @Override | ||
| protected void onCreation() { | ||
| setContentView(R.layout.activity_dashboard); | ||
| setUpView(); | ||
| loadCountSummeryFragment(0); | ||
|
|
||
| } | ||
| private void loadCountSummeryFragment(int position){ | ||
| switch (position){ | ||
| case 0: | ||
| dashBoardFragment = new CountSummeryDashBoardFragment(); | ||
| break; | ||
| case 1: | ||
| dashBoardFragment = new WorkSummeryDashBoardFragment(); | ||
| break; | ||
| case 2: | ||
| dashBoardFragment = new DailyTargetAchievementFragment(); | ||
| break; | ||
| case 3: | ||
| dashBoardFragment = new MonthlyTargetAchievementFragment(); | ||
| break; | ||
| case 4: | ||
| dashBoardFragment = new DailyServiceTargetAchievementFragment(); | ||
| break; | ||
| case 5: | ||
| dashBoardFragment = new MonthlyServiceTargetAchievementFragment(); | ||
| break; | ||
| case 6: | ||
| dashBoardFragment = new ForumTargetAchievementFragment(); | ||
| break; | ||
| } | ||
|
|
||
| FragmentManager fragmentManager = getSupportFragmentManager(); | ||
| FragmentTransaction fragmentTransaction = | ||
| fragmentManager.beginTransaction(); | ||
| fragmentTransaction.replace(R.id.container, dashBoardFragment); | ||
| fragmentTransaction.commit(); | ||
| } | ||
| private void setUpView() { | ||
| refreshIndicatorsIcon = findViewById(R.id.refreshIndicatorsIcon); | ||
| refreshIndicatorsProgressBar = findViewById(R.id.refreshIndicatorsPB); | ||
| // Initial view until we determined by the refresh function | ||
| refreshIndicatorsProgressBar.setVisibility(View.GONE); | ||
| titleText = findViewById(R.id.textview_detail_two); | ||
|
|
||
| if(!HnppConstants.isReleaseBuild()){ | ||
| findViewById(R.id.toolbar).setBackgroundResource(R.color.test_app_color); | ||
|
|
||
| }else{ | ||
| findViewById(R.id.toolbar).setBackgroundResource(org.smartregister.family.R.color.customAppThemeBlue); | ||
|
|
||
| } | ||
|
|
||
| refreshIndicatorsIcon.setOnClickListener(view -> { | ||
| refreshIndicatorsIcon.setVisibility(View.GONE); | ||
| FadingCircle circle = new FadingCircle(); | ||
| refreshIndicatorsProgressBar.setIndeterminateDrawable(circle); | ||
| refreshIndicatorsProgressBar.setVisibility(View.VISIBLE); | ||
| new Handler().postDelayed(() -> dashBoardFragment.refreshData(() -> { | ||
| refreshIndicatorsProgressBar.setVisibility(View.GONE); | ||
| refreshIndicatorsIcon.setVisibility(View.VISIBLE); | ||
| }),500); | ||
|
|
||
| }); | ||
| tabs = findViewById(R.id.tabs); | ||
| tabs.addTab(tabs.newTab().setText("জনসংখ্যা সারসংক্ষেপ")); | ||
| tabs.addTab(tabs.newTab().setText("কার্যক্রম সারসংক্ষেপ")); | ||
| tabs.addTab(tabs.newTab().setText("দৈনিক পরিদর্শন")); | ||
| tabs.addTab(tabs.newTab().setText("মাসিক পরিদর্শন")); | ||
| tabs.addTab(tabs.newTab().setText("দৈনিক সেবা")); | ||
| tabs.addTab(tabs.newTab().setText("মাসিক সেবা")); | ||
| tabs.addTab(tabs.newTab().setText("ফোরাম")); | ||
| //tabs.addTab(tabs.newTab().setText("স্টক")); | ||
| tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { | ||
| @Override | ||
| public void onTabSelected(TabLayout.Tab tab) { | ||
| loadCountSummeryFragment(tabs.getSelectedTabPosition()); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void onTabUnselected(TabLayout.Tab tab) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void onTabReselected(TabLayout.Tab tab) { | ||
|
|
||
| } | ||
| }); | ||
| } | ||
| @Override | ||
| protected void onResumption() { | ||
| if(refreshIndicatorsProgressBar !=null && refreshIndicatorsProgressBar.getVisibility() == View.VISIBLE){ | ||
| refreshIndicatorsProgressBar.setVisibility(View.GONE); | ||
| } | ||
|
|
||
| } | ||
| public void updateTitle(String title){ | ||
| titleText.setText(title); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.