From 59e9c962a30b0f567981cc52942116d8b3de7474 Mon Sep 17 00:00:00 2001 From: hmalik144 Date: Thu, 7 Nov 2019 18:11:41 +1100 Subject: [PATCH] Updated 07/11 --- .idea/codeStyles/Project.xml | 112 --------------- .idea/dictionaries/h_mal.xml | 7 - .idea/misc.xml | 12 +- .idea/vcs.xml | 6 +- .../days_left_kotlin/AddShiftActivity.kt | 129 +++++++++--------- .../h_mal/days_left_kotlin/FirebaseClass.kt | 3 - .../h_mal/days_left_kotlin/FragmentList.kt | 24 ++-- .../h_mal/days_left_kotlin/MainActivity.kt | 4 +- 8 files changed, 80 insertions(+), 217 deletions(-) delete mode 100644 .idea/dictionaries/h_mal.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index cb22ebb..1bec35e 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,120 +1,8 @@ - - - - - - diff --git a/.idea/dictionaries/h_mal.xml b/.idea/dictionaries/h_mal.xml deleted file mode 100644 index d9162d2..0000000 --- a/.idea/dictionaries/h_mal.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - mandetory - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 703e5d4..0d45e8d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,14 +1,4 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index f9d1297..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,10 +1,6 @@ - - - - - + \ No newline at end of file diff --git a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/AddShiftActivity.kt b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/AddShiftActivity.kt index 54083c4..143177b 100644 --- a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/AddShiftActivity.kt +++ b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/AddShiftActivity.kt @@ -84,37 +84,39 @@ class AddShiftActivity : AppCompatActivity() { intent.getStringExtra(SHIFT_ID)?.let { progress_bar.visibility = View.VISIBLE - mDatabase.child(USER_FIREBASE).child(auth.uid!!).child(SHIFT_FIREBASE).child(it) - .addListenerForSingleValueEvent(object : ValueEventListener{ - override fun onCancelled(p0: DatabaseError) { - progress_bar.visibility = View.GONE - } + val ref = mDatabase.child(USER_FIREBASE).child(auth.uid!!).child(SHIFT_FIREBASE).child(it) - override fun onDataChange(dataSnapshot: DataSnapshot) { - progress_bar.visibility = View.GONE - val shiftObject:ShiftObject? = dataSnapshot.getValue(ShiftObject::class.java) + ref.keepSynced(true) + ref.addListenerForSingleValueEvent(object : ValueEventListener{ + override fun onCancelled(p0: DatabaseError) { + progress_bar.visibility = View.GONE + } - shiftObject?.let {shift -> - abnObject = shift.abnObject - taskObject = shift.taskObject + override fun onDataChange(dataSnapshot: DataSnapshot) { + progress_bar.visibility = View.GONE + val shiftObject:ShiftObject? = dataSnapshot.getValue(ShiftObject::class.java) - shift.timeObject?.timeIn?.let { - timeObject = shift.timeObject - setTimeSummary() - Toast.makeText(baseContext,"toasted",Toast.LENGTH_SHORT) - } + shiftObject?.let {shift -> + abnObject = shift.abnObject + taskObject = shift.taskObject - if (shift.taskObject?.workType.equals(PIECE)) { - units.setText(shift.unitsCount.toString()) - } - - date.setText(shiftObject.shiftDate) - - setTaskCard() - setEmployerCard() + shift.timeObject?.timeIn?.let { + timeObject = shift.timeObject + setTimeSummary() + Toast.makeText(baseContext,"toasted",Toast.LENGTH_SHORT) } + + if (shift.taskObject?.workType.equals(PIECE)) { + units.setText(shift.unitsCount.toString()) + } + + date.setText(shiftObject.shiftDate) + + setTaskCard() + setEmployerCard() } - }) + } + }) } } @@ -168,7 +170,8 @@ class AddShiftActivity : AppCompatActivity() { progress_bar.visibility = View.VISIBLE shiftReference.setValue(shiftobj).addOnCompleteListener{task -> Log.i("Firebase", "onComplete: " + task.getResult()!!) - if (task.isSuccessful()) { + if (task.isSuccessful) { + Toast.makeText(this, "Shift Successfully submitted", Toast.LENGTH_LONG).show() finish() }else{ Toast.makeText(baseContext,"Could not submit shift", Toast.LENGTH_SHORT).show() @@ -217,47 +220,49 @@ class AddShiftActivity : AppCompatActivity() { val cont: Context = this if (abnObject != null) { - mDatabase.child(EMPLOYER_FIREBASE).child(abnObject!!.abn!!).child(TASK_FIREBASE) - .addListenerForSingleValueEvent(object : ValueEventListener{ - override fun onCancelled(p0: DatabaseError) { + val ref = mDatabase.child(EMPLOYER_FIREBASE).child(abnObject!!.abn!!).child(TASK_FIREBASE) - } + ref.keepSynced(true) + ref.addListenerForSingleValueEvent(object : ValueEventListener{ + override fun onCancelled(p0: DatabaseError) { - override fun onDataChange(p0: DataSnapshot) { - var list = ArrayList() - p0.exists().let { + } - for (snapshot in p0.children){ - list.add(snapshot.getValue(TaskObject::class.java)!!) - } + override fun onDataChange(p0: DataSnapshot) { + var list = ArrayList() + p0.exists().let { + + for (snapshot in p0.children){ + list.add(snapshot.getValue(TaskObject::class.java)!!) } - - val dialogView = LayoutInflater.from(cont).inflate(R.layout.dialog_previous_abns_used, null) - - val dialogListAdapter = DialogListAdapter(cont, list) - dialogView.list_item_list_dialog.setAdapter(dialogListAdapter) - - val builder = AlertDialog.Builder(cont) - builder.setView(dialogView) - - val alertDialog = builder.create() - alertDialog.show() - - dialogView.button_list_dialog.setOnClickListener(View.OnClickListener { - val intent = Intent(cont, AddItemActivity::class.java) - intent.putExtra(REQUEST, TASKREQUEST) - startActivityForResult(intent, TASKREQUEST) - alertDialog.dismiss() - }) - - dialogView.list_item_list_dialog.setOnItemClickListener(AdapterView.OnItemClickListener { parent, view, position, id -> - taskObject = list.get(position) - setTaskCard() - alertDialog.dismiss() - }) - progress_bar.setVisibility(View.GONE) } - }) + + val dialogView = LayoutInflater.from(cont).inflate(R.layout.dialog_previous_abns_used, null) + + val dialogListAdapter = DialogListAdapter(cont, list) + dialogView.list_item_list_dialog.setAdapter(dialogListAdapter) + + val builder = AlertDialog.Builder(cont) + builder.setView(dialogView) + + val alertDialog = builder.create() + alertDialog.show() + + dialogView.button_list_dialog.setOnClickListener(View.OnClickListener { + val intent = Intent(cont, AddItemActivity::class.java) + intent.putExtra(REQUEST, TASKREQUEST) + startActivityForResult(intent, TASKREQUEST) + alertDialog.dismiss() + }) + + dialogView.list_item_list_dialog.setOnItemClickListener(AdapterView.OnItemClickListener { parent, view, position, id -> + taskObject = list.get(position) + setTaskCard() + alertDialog.dismiss() + }) + progress_bar.setVisibility(View.GONE) + } + }) } else { val intent = Intent(this@AddShiftActivity, AddItemActivity::class.java) intent.putExtra(REQUEST, TASKREQUEST) diff --git a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FirebaseClass.kt b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FirebaseClass.kt index 4521009..9cab231 100644 --- a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FirebaseClass.kt +++ b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FirebaseClass.kt @@ -21,7 +21,4 @@ class FirebaseClass { } - - - } \ No newline at end of file diff --git a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FragmentList.kt b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FragmentList.kt index 77632d4..cea296b 100644 --- a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FragmentList.kt +++ b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/FragmentList.kt @@ -23,6 +23,7 @@ import com.appttude.h_mal.days_left_kotlin.FirebaseClass.Companion.SHIFT_ID import com.appttude.h_mal.days_left_kotlin.FirebaseClass.Companion.USER_FIREBASE import com.appttude.h_mal.days_left_kotlin.FirebaseClass.Companion.auth import com.appttude.h_mal.days_left_kotlin.FirebaseClass.Companion.mDatabase +import com.appttude.h_mal.days_left_kotlin.MainActivity.Companion.ref import com.appttude.h_mal.days_left_kotlin.Objects.AbnObject import com.appttude.h_mal.days_left_kotlin.Objects.ShiftObject import com.google.firebase.database.DatabaseReference @@ -41,17 +42,8 @@ import kotlin.collections.ArrayList class FragmentList : androidx.fragment.app.Fragment() { - - lateinit var reference : DatabaseReference lateinit var fireAdapter:FireAdapter - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - reference = mDatabase.child(USER_FIREBASE).child(auth.uid!!).child(SHIFT_FIREBASE) - reference.keepSynced(true) - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -63,7 +55,7 @@ class FragmentList : androidx.fragment.app.Fragment() { super.onActivityCreated(savedInstanceState) //set custom firebase adapter on listview - fireAdapter = FireAdapter(activity, ShiftObject::class.java,R.layout.list_item,reference) + fireAdapter = FireAdapter(activity, ShiftObject::class.java,R.layout.list_item,ref) page_two_list.adapter = fireAdapter page_two_list.setOnItemClickListener(object : AdapterView.OnItemClickListener{ @@ -121,20 +113,20 @@ class FragmentList : androidx.fragment.app.Fragment() { alt_bld.setSingleChoiceItems(grpname, checkedItem) { dialog, item -> when (item) { 0 -> { - val q1 = reference.orderByChild("abnObject/companyName").equalTo("GREEN CLOUD NURSERY") + val q1 = ref.orderByChild("abnObject/companyName").equalTo("GREEN CLOUD NURSERY") fireAdapter = FireAdapter(activity, ShiftObject::class.java, R.layout.list_item, q1) } 1 -> fireAdapter = FireAdapter( activity, ShiftObject::class.java, R.layout.list_item, - reference.orderByChild("dateTimeAdded") + ref.orderByChild("dateTimeAdded") ) 2 -> fireAdapter = FireAdapter( activity, ShiftObject::class.java, R.layout.list_item, - reference.orderByChild("shiftDate") + ref.orderByChild("shiftDate") ) } page_two_list.adapter = fireAdapter @@ -198,7 +190,7 @@ class FragmentList : androidx.fragment.app.Fragment() { typeDialog.setSingleChoiceItems( arrayOf("Hourly", "Piece Rate"), -1 ) { dialog, which -> - val q1 = reference.orderByChild("taskObject/workType").equalTo(typeString[which]) + val q1 = ref.orderByChild("taskObject/workType").equalTo(typeString[which]) fireAdapter = FireAdapter(activity, ShiftObject::class.java, R.layout.list_item, q1) page_two_list.adapter = fireAdapter @@ -222,9 +214,9 @@ class FragmentList : androidx.fragment.app.Fragment() { fun applyFilter(arg1: String, arg2: String?) { val q1: Query if (arg2 == null) { - q1 = reference.orderByChild("abnObject/abn").equalTo(arg1) + q1 = ref.orderByChild("abnObject/abn").equalTo(arg1) } else { - q1 = reference.orderByChild("shiftDate").startAt(arg1).endAt(arg2) + q1 = ref.orderByChild("shiftDate").startAt(arg1).endAt(arg2) } fireAdapter = FireAdapter(activity, ShiftObject::class.java, R.layout.list_item, q1) diff --git a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/MainActivity.kt b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/MainActivity.kt index 9b3929b..5f88129 100644 --- a/app/src/main/java/com/appttude/h_mal/days_left_kotlin/MainActivity.kt +++ b/app/src/main/java/com/appttude/h_mal/days_left_kotlin/MainActivity.kt @@ -31,6 +31,7 @@ import kotlinx.android.synthetic.main.nav_header_main.view.* class MainActivity : AppCompatActivity() { companion object{ var shiftList = ArrayList() + val ref = mDatabase.child(USER_FIREBASE).child(auth.uid as String).child(SHIFT_FIREBASE) } lateinit var fragmentManager: FragmentManager @@ -158,7 +159,8 @@ class MainActivity : AppCompatActivity() { val uid = auth.uid as String progBar.visibility = View.VISIBLE - mDatabase.child(USER_FIREBASE).child(uid).child(SHIFT_FIREBASE).addValueEventListener(object : ValueEventListener { + ref.keepSynced(true) + ref.addValueEventListener(object : ValueEventListener { override fun onCancelled(p0: DatabaseError) { progBar.visibility = View.GONE }