refs #5867 sendDriverRoute
This commit is contained in:
parent
15669ba5a9
commit
f6bfb3c8ec
|
@ -110,21 +110,27 @@ class TicketsFragment(
|
||||||
val iconSettings = ImageView(context)
|
val iconSettings = ImageView(context)
|
||||||
val iconSort = ImageView(context)
|
val iconSort = ImageView(context)
|
||||||
val iconSigned = ImageView(context)
|
val iconSigned = ImageView(context)
|
||||||
|
val iconSend = ImageView(context)
|
||||||
|
|
||||||
|
|
||||||
iconSettings.setImageResource(R.drawable.ic_setting_ui)
|
iconSettings.setImageResource(R.drawable.ic_setting_ui)
|
||||||
iconSort.setImageResource(R.drawable.ic_sort)
|
iconSort.setImageResource(R.drawable.ic_sort)
|
||||||
iconSigned.setImageResource(R.drawable.ic_sign_ticket)
|
iconSigned.setImageResource(R.drawable.ic_sign_ticket)
|
||||||
|
iconSend.setImageResource(R.drawable.ic_send)
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
iconSettings.tooltipText = getTooltip(R.drawable.ic_setting_ui)
|
iconSettings.tooltipText = getTooltip(R.drawable.ic_setting_ui)
|
||||||
iconSort.tooltipText = getTooltip(R.drawable.ic_sort)
|
iconSort.tooltipText = getTooltip(R.drawable.ic_sort)
|
||||||
iconSigned.tooltipText = getTooltip(R.drawable.ic_sign_ticket)
|
iconSigned.tooltipText = getTooltip(R.drawable.ic_sign_ticket)
|
||||||
|
iconSend.tooltipText = getTooltip(R.drawable.ic_send)
|
||||||
|
|
||||||
}
|
}
|
||||||
listIcons.add(iconSigned)
|
listIcons.add(iconSigned)
|
||||||
|
listIcons.add(iconSend)
|
||||||
listIcons.add(iconSettings)
|
listIcons.add(iconSettings)
|
||||||
listIcons.add(iconSort)
|
|
||||||
|
// listIcons.add(iconSort)
|
||||||
|
|
||||||
|
|
||||||
changeColorIcon(iconSigned.drawable, showSigned)
|
changeColorIcon(iconSigned.drawable, showSigned)
|
||||||
changeColorIcon(iconSettings.drawable, showSigned)
|
changeColorIcon(iconSettings.drawable, showSigned)
|
||||||
|
@ -173,6 +179,16 @@ class TicketsFragment(
|
||||||
changeColorIcon(iconSigned.drawable, showSigned)
|
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()
|
}.hideDialog().show()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
val listPhonesAdapter =
|
val listPhonesAdapter =
|
||||||
GeneralAdapter(phones, object : OnGeneralItemRowClickListener {
|
GeneralAdapter(phones, object : OnGeneralItemRowClickListener {
|
||||||
override fun OnGeneralItemRowClickListener(item: GeneralItem) {
|
override fun OnGeneralItemRowClickListener(item: GeneralItem) {
|
||||||
|
|
|
@ -121,13 +121,15 @@ class RouteInfo(
|
||||||
var hour: String?,
|
var hour: String?,
|
||||||
@TypeConverters(MapTypeConverter::class) var created: Date,
|
@TypeConverters(MapTypeConverter::class) var created: Date,
|
||||||
var m3: Double,
|
var m3: Double,
|
||||||
var numberPlate: String,
|
var numberPlate: String?,
|
||||||
var name: String,
|
var name: String,
|
||||||
var kmStart: Long,
|
var kmStart: Long,
|
||||||
var kmEnd: Long,
|
var kmEnd: Long,
|
||||||
var started: String,
|
var started: String,
|
||||||
var finished: String,
|
var finished: String,
|
||||||
var header :Boolean = false
|
var header :Boolean = false,
|
||||||
|
//tarea 5867
|
||||||
|
var email:String? = null
|
||||||
):Serializable {
|
):Serializable {
|
||||||
override fun toString(): String {
|
override fun toString(): String {
|
||||||
return "$driver$id$name$numberPlate$m3$created$hour$"
|
return "$driver$id$name$numberPlate$m3$created$hour$"
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
<vector android:height="24dp" android:tint="#FFF"
|
||||||
|
android:viewportHeight="24.0"
|
||||||
|
android:viewportWidth="24.0"
|
||||||
|
android:width="24dp"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="#FFF" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
|
||||||
|
</vector>
|
|
@ -661,6 +661,8 @@
|
||||||
<string name="manuallyPermission">Habilita manualmente el permiso de ubicación.</string>
|
<string name="manuallyPermission">Habilita manualmente el permiso de ubicación.</string>
|
||||||
<string name="itemNecessary">El campo item es obligatorio</string>
|
<string name="itemNecessary">El campo item es obligatorio</string>
|
||||||
<string name="sacador_test">Sacador Test</string>
|
<string name="sacador_test">Sacador Test</string>
|
||||||
|
<string name="routeNotTickets">La ruta no tiene tickets a enviar o el conductor no tiene email asociado.</string>
|
||||||
|
<string name="sendDriverRoute">Envía la hoja de ruta al conductor</string>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -661,5 +661,7 @@
|
||||||
<string name="manuallyPermission">Activez manuellement l\'autorisation de localisation.</string>
|
<string name="manuallyPermission">Activez manuellement l\'autorisation de localisation.</string>
|
||||||
<string name="itemNecessary">Le champ \'item\' est requis</string>
|
<string name="itemNecessary">Le champ \'item\' est requis</string>
|
||||||
<string name="sacador_test">Sacador Test</string>
|
<string name="sacador_test">Sacador Test</string>
|
||||||
|
<string name="routeNotTickets">La route n\'a pas de billets à envoyer</string>
|
||||||
|
<string name="sendDriverRoute">Envoyez la feuille de route au conducteur</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -661,5 +661,7 @@
|
||||||
<string name="manuallyPermission">Habilite manualmente a permissão de localização.</string>
|
<string name="manuallyPermission">Habilite manualmente a permissão de localização.</string>
|
||||||
<string name="itemNecessary">O campo \'item\' é obrigatório</string>
|
<string name="itemNecessary">O campo \'item\' é obrigatório</string>
|
||||||
<string name="sacador_test">Sacador Test</string>
|
<string name="sacador_test">Sacador Test</string>
|
||||||
|
<string name="routeNotTickets">"A rota não possui bilhetes para enviar</string>
|
||||||
|
<string name="sendDriverRoute">Envie o itinerário para o motorista</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -660,5 +660,7 @@
|
||||||
<string name="manuallyPermission">Manually Enable Location Permission.</string>
|
<string name="manuallyPermission">Manually Enable Location Permission.</string>
|
||||||
<string name="itemNecessary">Item fiels is required</string>
|
<string name="itemNecessary">Item fiels is required</string>
|
||||||
<string name="sacador_test">Sacador Test</string>
|
<string name="sacador_test">Sacador Test</string>
|
||||||
|
<string name="routeNotTickets">The route has no tickets to send</string>
|
||||||
|
<string name="sendDriverRoute">Send the roadmap to the driver</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue