diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt index 680b1512..bc7e8d39 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt @@ -110,21 +110,27 @@ class TicketsFragment( val iconSettings = ImageView(context) val iconSort = ImageView(context) val iconSigned = ImageView(context) + val iconSend = ImageView(context) iconSettings.setImageResource(R.drawable.ic_setting_ui) iconSort.setImageResource(R.drawable.ic_sort) iconSigned.setImageResource(R.drawable.ic_sign_ticket) + iconSend.setImageResource(R.drawable.ic_send) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { iconSettings.tooltipText = getTooltip(R.drawable.ic_setting_ui) iconSort.tooltipText = getTooltip(R.drawable.ic_sort) iconSigned.tooltipText = getTooltip(R.drawable.ic_sign_ticket) + iconSend.tooltipText = getTooltip(R.drawable.ic_send) } listIcons.add(iconSigned) + listIcons.add(iconSend) listIcons.add(iconSettings) - listIcons.add(iconSort) + + // listIcons.add(iconSort) + changeColorIcon(iconSigned.drawable, showSigned) changeColorIcon(iconSettings.drawable, showSigned) @@ -173,6 +179,16 @@ class TicketsFragment( changeColorIcon(iconSigned.drawable, showSigned) } + //Tarea 5867 + iconSend.drawable -> { + + if (myListClientTicket.isEmpty() || route.email.isNullOrEmpty()) { + getString(R.string.routeNotTickets).toast(requireContext()) + } else { + callBack(viewModel.driverRouteEmail(route.id, route.email!!)) + } + + } } } @@ -581,7 +597,6 @@ class TicketsFragment( }.hideDialog().show() - val listPhonesAdapter = GeneralAdapter(phones, object : OnGeneralItemRowClickListener { override fun OnGeneralItemRowClickListener(item: GeneralItem) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt index e3bd742b..bd3f0440 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt @@ -121,13 +121,15 @@ class RouteInfo( var hour: String?, @TypeConverters(MapTypeConverter::class) var created: Date, var m3: Double, - var numberPlate: String, + var numberPlate: String?, var name: String, var kmStart: Long, var kmEnd: Long, var started: String, var finished: String, - var header :Boolean = false + var header :Boolean = false, + //tarea 5867 + var email:String? = null ):Serializable { override fun toString(): String { return "$driver$id$name$numberPlate$m3$created$hour$" diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml new file mode 100644 index 00000000..5f1ae79c --- /dev/null +++ b/app/src/main/res/drawable/ic_send.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d789b62f..d1dcc49e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -661,6 +661,8 @@ Habilita manualmente el permiso de ubicación. El campo item es obligatorio Sacador Test + La ruta no tiene tickets a enviar o el conductor no tiene email asociado. + Envía la hoja de ruta al conductor diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a0779f30..8dc5b5f2 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -661,5 +661,7 @@ Activez manuellement l\'autorisation de localisation. Le champ \'item\' est requis Sacador Test + La route n\'a pas de billets à envoyer + Envoyez la feuille de route au conducteur diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index daeae731..c02611e3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -661,5 +661,7 @@ Habilite manualmente a permissão de localização. O campo \'item\' é obrigatório Sacador Test + "A rota não possui bilhetes para enviar + Envie o itinerário para o motorista diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6392e0f9..cdfadf49 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -660,5 +660,7 @@ Manually Enable Location Permission. Item fiels is required Sacador Test + The route has no tickets to send + Send the roadmap to the driver