Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

myHealth : removed change member (fixes #5161) #5162

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ import java.util.Locale
class MyHealthFragment : Fragment() {
private lateinit var fragmentVitalSignBinding: FragmentVitalSignBinding
private lateinit var alertMyPersonalBinding: AlertMyPersonalBinding
private lateinit var alertHealthListBinding: AlertHealthListBinding
var profileDbHandler: UserProfileDbHandler? = null
var userId: String? = null
lateinit var mRealm: Realm
var userModel: RealmUserModel? = null
lateinit var userModelList: List<RealmUserModel>
lateinit var adapter: UserListArrayAdapter
var dialog: AlertDialog? = null

Expand Down Expand Up @@ -76,8 +74,6 @@ class MyHealthFragment : Fragment() {
userId = if (TextUtils.isEmpty(profileDbHandler?.userModel?._id)) profileDbHandler?.userModel?.id else profileDbHandler?.userModel?._id
getHealthRecords(userId)

fragmentVitalSignBinding.btnnewPatient.visibility = View.VISIBLE
fragmentVitalSignBinding.btnnewPatient.setOnClickListener { selectPatient() }
fragmentVitalSignBinding.updateHealth.visibility = View.VISIBLE

fragmentVitalSignBinding.updateHealth.setOnClickListener {
Expand All @@ -100,87 +96,6 @@ class MyHealthFragment : Fragment() {
showRecords()
}

private fun selectPatient() {
userModelList = mRealm.where(RealmUserModel::class.java).sort("joinDate", Sort.DESCENDING).findAll()
adapter = UserListArrayAdapter(requireActivity(), android.R.layout.simple_list_item_1, userModelList)
alertHealthListBinding = AlertHealthListBinding.inflate(LayoutInflater.from(context))
alertHealthListBinding.btnAddMember.setOnClickListener {
startActivity(Intent(requireContext(), BecomeMemberActivity::class.java))
}

setTextWatcher(alertHealthListBinding.etSearch, alertHealthListBinding.btnAddMember, alertHealthListBinding.list)
alertHealthListBinding.list.adapter = adapter
alertHealthListBinding.list.onItemClickListener = OnItemClickListener { _: AdapterView<*>?, _: View, i: Int, _: Long ->
val selected = alertHealthListBinding.list.adapter.getItem(i) as RealmUserModel
userId = if (selected._id.isNullOrEmpty()) selected.id else selected._id
getHealthRecords(userId)
dialog?.dismiss()
}
sortList(alertHealthListBinding.spnSort, alertHealthListBinding.list)
dialog = AlertDialog.Builder(requireActivity(),R.style.AlertDialogTheme)
.setTitle(getString(R.string.select_health_member)).setView(alertHealthListBinding.root)
.setCancelable(false).setNegativeButton(R.string.dismiss, null).create()
dialog?.show()
}

private fun sortList(spnSort: AppCompatSpinner, lv: ListView) {
spnSort.onItemSelectedListener = object : OnItemSelectedListener {
override fun onNothingSelected(p0: AdapterView<*>?) {}

override fun onItemSelected(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
val sort: Sort
val sortBy: String
when (p2) {
0 -> {
sortBy = "joinDate"
sort = Sort.DESCENDING
}
1 -> {
sortBy = "joinDate"
sort = Sort.ASCENDING
}
2 -> {
sortBy = "name"
sort = Sort.ASCENDING
}
else -> {
sortBy = "name"
sort = Sort.DESCENDING
}
}
userModelList = mRealm.where(RealmUserModel::class.java).sort(sortBy, sort).findAll()
adapter = UserListArrayAdapter(requireActivity(), android.R.layout.simple_list_item_1, userModelList)
lv.adapter = adapter
}
}
}

private fun setTextWatcher(etSearch: EditText, btnAddMember: Button, lv: ListView) {
var timer: CountDownTimer? = null
etSearch.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}

override fun afterTextChanged(editable: Editable) {
timer?.cancel()
timer = object : CountDownTimer(1000, 1500) {
override fun onTick(millisUntilFinished: Long) {}
override fun onFinish() {
val userModelList = mRealm.where(RealmUserModel::class.java)
.contains("firstName", editable.toString(), Case.INSENSITIVE).or()
.contains("lastName", editable.toString(), Case.INSENSITIVE).or()
.contains("name", editable.toString(), Case.INSENSITIVE)
.sort("joinDate", Sort.DESCENDING).findAll()

val adapter = UserListArrayAdapter(requireActivity(), android.R.layout.simple_list_item_1, userModelList)
lv.adapter = adapter
btnAddMember.visibility = if (adapter.count == 0) View.VISIBLE else View.GONE
}
}.start()
}
})
}

override fun onResume() {
super.onResume()
showRecords()
Expand Down
8 changes: 0 additions & 8 deletions app/src/main/res/layout/fragment_vital_sign.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@
android:gravity="right"
android:padding="@dimen/padding_small">

<Button
android:id="@+id/btnnew_patient"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/change_member"
android:theme="@style/BlueButton"
android:visibility="visible" />
<Button
android:id="@+id/add_new_record"
android:layout_width="wrap_content"
Expand Down