From 16fbfaee4dfe19911ffc8abf3b613318be98e918 Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Thu, 13 Oct 2022 00:12:08 +0200 Subject: [PATCH] Vereinheitliche Klassen-Namen --- .../data/{ProjectEntry.kt => Mission.kt} | 2 +- .../techniklogger/data/ParseController.kt | 48 +++++++++---------- .../{ProjectTechniker.kt => Participation.kt} | 2 +- .../fragments/ListingFragment.kt | 8 ++-- ...{ProjectFragment.kt => MissionFragment.kt} | 42 ++++++++-------- ...erFragment.kt => MissionPusherFragment.kt} | 12 ++--- .../{ProjectsAdapter.kt => MissionAdapter.kt} | 16 +++---- ...ikerAdapter.kt => ParticipationAdapter.kt} | 14 +++--- .../techniklogger/recycler/YearAdapter.kt | 2 +- .../techniklogger/table/ExportBuilder.kt | 18 +++---- ...gment_project.xml => fragment_mission.xml} | 0 ...pusher.xml => fragment_mission_pusher.xml} | 0 ...recycler_projects.xml => item_mission.xml} | 0 .../{item_recycler_year.xml => item_year.xml} | 0 .../main/res/navigation/mobile_navigation.xml | 16 +++---- 15 files changed, 90 insertions(+), 90 deletions(-) rename app/src/main/java/com/cyb3rko/techniklogger/data/{ProjectEntry.kt => Mission.kt} (89%) rename app/src/main/java/com/cyb3rko/techniklogger/data/{ProjectTechniker.kt => Participation.kt} (85%) rename app/src/main/java/com/cyb3rko/techniklogger/fragments/{ProjectFragment.kt => MissionFragment.kt} (93%) rename app/src/main/java/com/cyb3rko/techniklogger/fragments/{EinsatzPusherFragment.kt => MissionPusherFragment.kt} (95%) rename app/src/main/java/com/cyb3rko/techniklogger/recycler/{ProjectsAdapter.kt => MissionAdapter.kt} (79%) rename app/src/main/java/com/cyb3rko/techniklogger/recycler/{ProjectTechnikerAdapter.kt => ParticipationAdapter.kt} (71%) rename app/src/main/res/layout/{fragment_project.xml => fragment_mission.xml} (100%) rename app/src/main/res/layout/{fragment_einsatz_pusher.xml => fragment_mission_pusher.xml} (100%) rename app/src/main/res/layout/{item_recycler_projects.xml => item_mission.xml} (100%) rename app/src/main/res/layout/{item_recycler_year.xml => item_year.xml} (100%) diff --git a/app/src/main/java/com/cyb3rko/techniklogger/data/ProjectEntry.kt b/app/src/main/java/com/cyb3rko/techniklogger/data/Mission.kt similarity index 89% rename from app/src/main/java/com/cyb3rko/techniklogger/data/ProjectEntry.kt rename to app/src/main/java/com/cyb3rko/techniklogger/data/Mission.kt index 78622a6..a4b0c30 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/data/ProjectEntry.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/data/Mission.kt @@ -2,7 +2,7 @@ package com.cyb3rko.techniklogger.data import java.util.* -data class ProjectEntry( +data class Mission( val date: Date, val duration: String, val location: String, diff --git a/app/src/main/java/com/cyb3rko/techniklogger/data/ParseController.kt b/app/src/main/java/com/cyb3rko/techniklogger/data/ParseController.kt index b0b3f14..d75e820 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/data/ParseController.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/data/ParseController.kt @@ -51,9 +51,23 @@ object ParseController { } } - internal fun fetchProjects( + internal fun fetchMission( + objectId: String?, + action: (entry: ParseObject?, e: ParseException?) -> Unit + ) { + val query = getQuery(CLASS_EINSATZ) + query.getInBackground(objectId) { entry, e -> + if (e == null) { + action(entry, null) + } else { + action(null, e) + } + } + } + + internal fun fetchMissions( year: String?, - action: (projects: List, e: ParseException?) -> Unit + action: (missions: List, e: ParseException?) -> Unit ) { val query = getQuery("Einsatz") query.orderByDescending(COLUMN_EINSATZ_DATUM) @@ -66,12 +80,12 @@ object ParseController { ) query.findInBackground { objects, e -> if (e == null) { - val data = mutableListOf() + val data = mutableListOf() objects.forEach { val dates = it.getString(COLUMN_EINSATZ_DATUM)!!.split(",") val time = if (dates.size > 1) dates[1] else "" data.add( - ProjectEntry( + Mission( SimpleDateFormat("yyyy.MM.dd", Locale.GERMANY).parse(dates[0])!!, it.getInt(COLUMN_EINSATZ_DAUER).toString(), it.getString(COLUMN_EINSATZ_ORT)!!, @@ -88,27 +102,13 @@ object ParseController { } } - internal fun fetchProject( - objectId: String?, - action: (project: ParseObject?, e: ParseException?) -> Unit - ) { - val query = getQuery(CLASS_EINSATZ) - query.getInBackground(objectId) { entry, e -> - if (e == null) { - action(entry, null) - } else { - action(null, e) - } - } - } - - internal fun fetchSingleTeilnahme( - projectId: String, + internal fun fetchParticipation( + missionId: String, technikerId: String, action: (entry: ParseObject?, e: ParseException?) -> Unit ) { val query = getQuery(CLASS_TEILNAHME, false) - query.whereEqualTo(COLUMN_TEILNAHME_AN, ParseObject.createWithoutData(CLASS_EINSATZ, projectId)) + query.whereEqualTo(COLUMN_TEILNAHME_AN, ParseObject.createWithoutData(CLASS_EINSATZ, missionId)) query.whereEqualTo(COLUMN_TEILNAHME_VON, ParseObject.createWithoutData(CLASS_EINSATZ, technikerId)) query.getFirstInBackground { entry, e -> if (e == null) { @@ -117,13 +117,13 @@ object ParseController { } } - internal fun fetchTeilnahmen( - projectId: String, + internal fun fetchParticipations( + missionId: String, includeTechniker: Boolean, action: (entries: List, e: ParseException?) -> Unit ) { val query = getQuery(CLASS_TEILNAHME, false) - query.whereEqualTo("an", ParseObject.createWithoutData(CLASS_EINSATZ, projectId)) + query.whereEqualTo("an", ParseObject.createWithoutData(CLASS_EINSATZ, missionId)) if (includeTechniker) query.include("von") query.findInBackground { entries, e -> if (e == null) { diff --git a/app/src/main/java/com/cyb3rko/techniklogger/data/ProjectTechniker.kt b/app/src/main/java/com/cyb3rko/techniklogger/data/Participation.kt similarity index 85% rename from app/src/main/java/com/cyb3rko/techniklogger/data/ProjectTechniker.kt rename to app/src/main/java/com/cyb3rko/techniklogger/data/Participation.kt index f885650..6f18ae4 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/data/ProjectTechniker.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/data/Participation.kt @@ -1,6 +1,6 @@ package com.cyb3rko.techniklogger.data -data class ProjectTechniker( +data class Participation( var dauer: String, val name: String, val objectId: String, diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt index a9ee925..6e2355d 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ListingFragment.kt @@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView import com.cyb3rko.techniklogger.* import com.cyb3rko.techniklogger.data.ParseController import com.cyb3rko.techniklogger.databinding.FragmentListingBinding -import com.cyb3rko.techniklogger.recycler.ProjectsAdapter +import com.cyb3rko.techniklogger.recycler.MissionAdapter import com.cyb3rko.techniklogger.table.ExportBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder import es.dmoral.toasty.Toasty @@ -29,7 +29,7 @@ class ListingFragment : Fragment() { private lateinit var myContext: Context private var adminMode: Boolean? = null - private lateinit var projectsAdapter: ProjectsAdapter + private lateinit var projectsAdapter: MissionAdapter private var isFABOpen = false private lateinit var sharedPref: SharedPreferences private lateinit var sharedPrefEditor: SharedPreferences.Editor @@ -51,7 +51,7 @@ class ListingFragment : Fragment() { binding.loadingAnimation.playAnimation() - projectsAdapter = ProjectsAdapter({ objectId: String -> + projectsAdapter = MissionAdapter({ objectId: String -> val action = ListingFragmentDirections.navigateToProject(objectId) findNavController().navigate(action) }, { @@ -144,7 +144,7 @@ class ListingFragment : Fragment() { } private fun loadEntries() { - ParseController.fetchProjects( + ParseController.fetchMissions( sharedPref.getString(CURRENT_YEAR, "") ) { entries, e -> if (e == null) { diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ProjectFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/MissionFragment.kt similarity index 93% rename from app/src/main/java/com/cyb3rko/techniklogger/fragments/ProjectFragment.kt rename to app/src/main/java/com/cyb3rko/techniklogger/fragments/MissionFragment.kt index 973dff9..2a1182f 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ProjectFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/MissionFragment.kt @@ -18,9 +18,9 @@ import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import com.cyb3rko.techniklogger.* import com.cyb3rko.techniklogger.data.ParseController -import com.cyb3rko.techniklogger.databinding.FragmentProjectBinding -import com.cyb3rko.techniklogger.data.ProjectTechniker -import com.cyb3rko.techniklogger.recycler.ProjectTechnikerAdapter +import com.cyb3rko.techniklogger.databinding.FragmentMissionBinding +import com.cyb3rko.techniklogger.data.Participation +import com.cyb3rko.techniklogger.recycler.ParticipationAdapter import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat @@ -30,12 +30,12 @@ import java.sql.Time import java.text.DecimalFormat @SuppressLint("SetTextI18n") -class ProjectFragment : Fragment() { - private var _binding: FragmentProjectBinding? = null +class MissionFragment : Fragment() { + private var _binding: FragmentMissionBinding? = null private lateinit var myContext: Context - private val args: ProjectFragmentArgs by navArgs() + private val args: MissionFragmentArgs by navArgs() - private lateinit var technikerAdapter: ProjectTechnikerAdapter + private lateinit var technikerAdapter: ParticipationAdapter private var adminMode = false private var objectId = "" private var dauer = "" @@ -49,7 +49,7 @@ class ProjectFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { - _binding = FragmentProjectBinding.inflate(inflater, container, false) + _binding = FragmentMissionBinding.inflate(inflater, container, false) val root = binding.root myContext = requireContext() @@ -58,7 +58,7 @@ class ProjectFragment : Fragment() { objectId = args.objectId - technikerAdapter = ProjectTechnikerAdapter { + technikerAdapter = ParticipationAdapter { if (adminMode || it.name == sharedPref.getString(NAME, "")) { val uhrzeit = if (it.uhrzeit == "0") time else it.uhrzeit val message = "Arbeitszeit:
$uhrzeit Uhr

" + @@ -139,7 +139,7 @@ class ProjectFragment : Fragment() { saveInBackground() } } else { - ParseController.fetchSingleTeilnahme(objectId, it.objectId) { entry, e -> + ParseController.fetchParticipation(objectId, it.objectId) { entry, e -> if (e == null) { it.teilnahmeKey = entry!!.objectId val dauerFloat = it.dauer.toFloat() @@ -170,7 +170,7 @@ class ProjectFragment : Fragment() { if (it.teilnahmeKey != "0") { ParseObject.createWithoutData(CLASS_TEILNAHME, it.teilnahmeKey).deleteInBackground() } else { - ParseController.fetchSingleTeilnahme(objectId, it.objectId) { entry, e -> + ParseController.fetchParticipation(objectId, it.objectId) { entry, e -> if (e == null) { entry!!.deleteInBackground { if (it != null) { @@ -213,7 +213,7 @@ class ProjectFragment : Fragment() { .setTitle("Techniker entfernen") .setMessage("Möchtest du alle eingetragenen Techniker entfernen?") .setPositiveButton("Ja") { _, _ -> - ParseController.fetchTeilnahmen(objectId, false) { entries, e -> + ParseController.fetchParticipations(objectId, false) { entries, e -> if (e == null) { ParseObject.deleteAllInBackground(entries) technikerAdapter.submitList(listOf()) @@ -247,29 +247,29 @@ class ProjectFragment : Fragment() { } private fun loadData() { - ParseController.fetchProject(objectId) { project, e -> + ParseController.fetchMission(objectId) { mission, e -> if (e == null) { - binding.titleView.text = project!!.getString(COLUMN_EINSATZ_NAME) - binding.locationView.text = project.getString(COLUMN_EINSATZ_ORT) - val dates = project.getString(COLUMN_EINSATZ_DATUM)!!.split(",") + binding.titleView.text = mission!!.getString(COLUMN_EINSATZ_NAME) + binding.locationView.text = mission.getString(COLUMN_EINSATZ_ORT) + val dates = mission.getString(COLUMN_EINSATZ_DATUM)!!.split(",") val dateParts = dates[0].split(".") val date = "${dateParts[2]}.${dateParts[1]}.${dateParts[0]}" - dauer = project.getNumber(COLUMN_EINSATZ_DAUER)!!.toString() + dauer = mission.getNumber(COLUMN_EINSATZ_DAUER)!!.toString() if (dates.size > 1) time = dates[1] val time = if (dates.size > 1) ", ${dates[1]}" else ", $dauer h" binding.dateView.text = date + time - ParseController.fetchTeilnahmen(objectId, true) { entries, e2 -> + ParseController.fetchParticipations(objectId, true) { entries, e2 -> if (e2 == null) { if (entries.isNotEmpty()) { - val techniker = mutableListOf() + val techniker = mutableListOf() entries.forEach { val teilnehmenderTechniker = it.getParseObject(COLUMN_TEILNAHME_VON)!! val dauerEntry = it.getNumber(COLUMN_EINSATZ_DAUER)!! - val dauer = if (dauerEntry == 0) project.getNumber(COLUMN_TEILNAHME_DAUER)!!.toString() else dauerEntry.toString() + val dauer = if (dauerEntry == 0) mission.getNumber(COLUMN_TEILNAHME_DAUER)!!.toString() else dauerEntry.toString() val time = it.getString(COLUMN_EINSATZ_UHRZEIT)!! techniker.add( - ProjectTechniker( + Participation( dauer, teilnehmenderTechniker.getString(COLUMN_EINSATZ_NAME)!!, teilnehmenderTechniker.objectId, diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/EinsatzPusherFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/MissionPusherFragment.kt similarity index 95% rename from app/src/main/java/com/cyb3rko/techniklogger/fragments/EinsatzPusherFragment.kt rename to app/src/main/java/com/cyb3rko/techniklogger/fragments/MissionPusherFragment.kt index 2731891..de20d10 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/EinsatzPusherFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/MissionPusherFragment.kt @@ -18,7 +18,7 @@ import com.cyb3rko.techniklogger.COLUMN_EINSATZ_JAHR import com.cyb3rko.techniklogger.CURRENT_YEAR import com.cyb3rko.techniklogger.SHARED_PREFERENCE import com.cyb3rko.techniklogger.data.ParseController -import com.cyb3rko.techniklogger.databinding.FragmentEinsatzPusherBinding +import com.cyb3rko.techniklogger.databinding.FragmentMissionPusherBinding import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.timepicker.MaterialTimePicker @@ -30,10 +30,10 @@ import java.text.DecimalFormat import java.text.SimpleDateFormat import java.util.* -class EinsatzPusherFragment : Fragment() { - private var _binding: FragmentEinsatzPusherBinding? = null +class MissionPusherFragment : Fragment() { + private var _binding: FragmentMissionPusherBinding? = null private lateinit var myContext: Context - private val args: EinsatzPusherFragmentArgs by navArgs() + private val args: MissionPusherFragmentArgs by navArgs() private lateinit var childKey: String private var date = "" @@ -55,7 +55,7 @@ class EinsatzPusherFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { - _binding = FragmentEinsatzPusherBinding.inflate(inflater, container, false) + _binding = FragmentMissionPusherBinding.inflate(inflater, container, false) val root = binding.root myContext = requireContext() @@ -129,7 +129,7 @@ class EinsatzPusherFragment : Fragment() { .setTitle("Einsatz entfernen") .setMessage("Möchtest du diesen Einsatz entfernen?") .setPositiveButton("Ja") { _, _ -> - ParseController.fetchTeilnahmen(childKey, false) { entries, e -> + ParseController.fetchParticipations(childKey, false) { entries, e -> if (e == null) { ParseObject.deleteAllInBackground(entries) { entry.deleteInBackground { diff --git a/app/src/main/java/com/cyb3rko/techniklogger/recycler/ProjectsAdapter.kt b/app/src/main/java/com/cyb3rko/techniklogger/recycler/MissionAdapter.kt similarity index 79% rename from app/src/main/java/com/cyb3rko/techniklogger/recycler/ProjectsAdapter.kt rename to app/src/main/java/com/cyb3rko/techniklogger/recycler/MissionAdapter.kt index b69b1c3..3ecee88 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/recycler/ProjectsAdapter.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/recycler/MissionAdapter.kt @@ -9,18 +9,18 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.cyb3rko.techniklogger.R -import com.cyb3rko.techniklogger.data.ProjectEntry +import com.cyb3rko.techniklogger.data.Mission import java.text.SimpleDateFormat import java.util.* -class ProjectsAdapter( +class MissionAdapter( val action: (objectId: String) -> Unit, - val actionLong: (project: ProjectEntry) -> Boolean -) : ListAdapter(ProjectDiffCallback) { + val actionLong: (mission: Mission) -> Boolean +) : ListAdapter(MissionDiffCallback) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val view = LayoutInflater.from(parent.context) - .inflate(R.layout.item_recycler_projects, parent, false) + .inflate(R.layout.item_mission, parent, false) return ViewHolder(view) } @@ -53,12 +53,12 @@ class ProjectsAdapter( val textView: TextView = view.findViewById(R.id.item_text) } - object ProjectDiffCallback : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: ProjectEntry, newItem: ProjectEntry): Boolean { + object MissionDiffCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: Mission, newItem: Mission): Boolean { return oldItem.objectId == newItem.objectId } - override fun areContentsTheSame(oldItem: ProjectEntry, newItem: ProjectEntry): Boolean { + override fun areContentsTheSame(oldItem: Mission, newItem: Mission): Boolean { return oldItem.date == newItem.date && oldItem.duration == newItem.duration && oldItem.location == newItem.location && diff --git a/app/src/main/java/com/cyb3rko/techniklogger/recycler/ProjectTechnikerAdapter.kt b/app/src/main/java/com/cyb3rko/techniklogger/recycler/ParticipationAdapter.kt similarity index 71% rename from app/src/main/java/com/cyb3rko/techniklogger/recycler/ProjectTechnikerAdapter.kt rename to app/src/main/java/com/cyb3rko/techniklogger/recycler/ParticipationAdapter.kt index 977c3f1..7999299 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/recycler/ProjectTechnikerAdapter.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/recycler/ParticipationAdapter.kt @@ -8,11 +8,11 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.cyb3rko.techniklogger.R -import com.cyb3rko.techniklogger.data.ProjectTechniker +import com.cyb3rko.techniklogger.data.Participation -class ProjectTechnikerAdapter( - val action: (techniker: ProjectTechniker) -> Unit -) : ListAdapter(ProjectTechnikerDiffCallback) { +class ParticipationAdapter( + val action: (techniker: Participation) -> Unit +) : ListAdapter(ParticipationDiffCallback) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val view = LayoutInflater.from(parent.context) @@ -34,12 +34,12 @@ class ProjectTechnikerAdapter( val titleView: TextView = view.findViewById(R.id.title) } - object ProjectTechnikerDiffCallback : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: ProjectTechniker, newItem: ProjectTechniker): Boolean { + object ParticipationDiffCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: Participation, newItem: Participation): Boolean { return oldItem.objectId == newItem.objectId } - override fun areContentsTheSame(oldItem: ProjectTechniker, newItem: ProjectTechniker): Boolean { + override fun areContentsTheSame(oldItem: Participation, newItem: Participation): Boolean { return oldItem.dauer == newItem.dauer && oldItem.name == newItem.name && oldItem.teilnahmeKey == newItem.teilnahmeKey && diff --git a/app/src/main/java/com/cyb3rko/techniklogger/recycler/YearAdapter.kt b/app/src/main/java/com/cyb3rko/techniklogger/recycler/YearAdapter.kt index 5296873..9ae408b 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/recycler/YearAdapter.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/recycler/YearAdapter.kt @@ -17,7 +17,7 @@ class YearAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val view = LayoutInflater.from(parent.context) - .inflate(R.layout.item_recycler_year, parent, false) + .inflate(R.layout.item_year, parent, false) return ViewHolder(view) } diff --git a/app/src/main/java/com/cyb3rko/techniklogger/table/ExportBuilder.kt b/app/src/main/java/com/cyb3rko/techniklogger/table/ExportBuilder.kt index 348ca67..e31680c 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/table/ExportBuilder.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/table/ExportBuilder.kt @@ -8,7 +8,7 @@ import android.view.View import androidx.core.content.FileProvider import com.cyb3rko.techniklogger.data.ParseController import com.cyb3rko.techniklogger.databinding.FragmentListingBinding -import com.cyb3rko.techniklogger.data.ProjectEntry +import com.cyb3rko.techniklogger.data.Mission import com.itextpdf.text.* import com.itextpdf.text.pdf.PdfPTable import com.itextpdf.text.pdf.PdfWriter @@ -23,9 +23,9 @@ import kotlin.Exception class ExportBuilder( private val myContext: Context, - data: MutableList, + data: MutableList, private val binding: FragmentListingBinding, - private val schuljahr: String + year: String ) : Document(PageSize.A4.rotate()) { private val data = data.reversed() private val destination = "${Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)}/" @@ -64,7 +64,7 @@ class ExportBuilder( try { this.open() table.addCell(TimeHeaderCell(time)) - table.addCell(HeaderCell(schuljahr)) + table.addCell(HeaderCell(year)) val columnHeaderTexts = listOf("Datum", "Veranstaltung", "Techniker", "Dauer insgesamt (h)") repeat(4) { table.addCell(ColumnHeaderCell(columnHeaderTexts[it])) @@ -78,7 +78,7 @@ class ExportBuilder( private fun fetchTechniker(index: Int = 0) { if (index < data.size) { - ParseController.fetchTeilnahmen(data[index].objectId, true) { entries, e -> + ParseController.fetchParticipations(data[index].objectId, true) { entries, e -> if (e == null) { val tempList = mutableListOf() var aktuellerTechniker: ParseObject @@ -96,12 +96,12 @@ class ExportBuilder( } private fun export() { - data.forEachIndexed { index, projectEntry -> + data.forEachIndexed { index, mission -> val information = listOf( - SimpleDateFormat("dd.MM.yyyy", Locale.GERMANY).format(projectEntry.date), - projectEntry.name, + SimpleDateFormat("dd.MM.yyyy", Locale.GERMANY).format(mission.date), + mission.name, techniker[index].joinToString("\n"), - projectEntry.duration) + mission.duration) information.forEachIndexed { _, string -> table.addCell(NormalCell(string)) } diff --git a/app/src/main/res/layout/fragment_project.xml b/app/src/main/res/layout/fragment_mission.xml similarity index 100% rename from app/src/main/res/layout/fragment_project.xml rename to app/src/main/res/layout/fragment_mission.xml diff --git a/app/src/main/res/layout/fragment_einsatz_pusher.xml b/app/src/main/res/layout/fragment_mission_pusher.xml similarity index 100% rename from app/src/main/res/layout/fragment_einsatz_pusher.xml rename to app/src/main/res/layout/fragment_mission_pusher.xml diff --git a/app/src/main/res/layout/item_recycler_projects.xml b/app/src/main/res/layout/item_mission.xml similarity index 100% rename from app/src/main/res/layout/item_recycler_projects.xml rename to app/src/main/res/layout/item_mission.xml diff --git a/app/src/main/res/layout/item_recycler_year.xml b/app/src/main/res/layout/item_year.xml similarity index 100% rename from app/src/main/res/layout/item_recycler_year.xml rename to app/src/main/res/layout/item_year.xml diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index e20840f..30f9669 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -17,17 +17,17 @@ tools:layout="@layout/fragment_listing"> + app:destination="@id/navigation_mission" /> + app:destination="@id/navigation_mission_pusher" /> + tools:layout="@layout/fragment_mission" > + tools:layout="@layout/fragment_mission_pusher">