verdnatura/vn-delivery
verdnatura
/
vn-delivery
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refs #5618 translate

This commit is contained in:
Sergio De la torre 2023-05-18 07:21:15 +02:00
parent 7bd8d2b24a
commit e6d9d4a4db
25 changed files with 327 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/verdnatura/es/repartoverdnatura/ConfigureActivity.java
View File

@ -72,7 +72,7 @@ public class ConfigureActivity extends AppCompatActivity {
txtHourStart.setText( selectedHour + ":" + selectedMinute);
}
}, hour, minute, true);//Yes 24 hour time
mTimePicker.setTitle("Select Time");
mTimePicker.setTitle(getString(R.string.selecTime));
mTimePicker.show();
}
});
@ -92,7 +92,7 @@ public class ConfigureActivity extends AppCompatActivity {
txtHourFinish.setText( selectedHour + ":" + selectedMinute);
}
}, hour, minute, true);//Yes 24 hour time
mTimePicker.setTitle("Select Time");
mTimePicker.setTitle(getString(R.string.selecTime));
mTimePicker.show();
}
});

14
app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionInfoActivity.kt
View File

@ -93,7 +93,7 @@ class ExpeditionInfoActivity : AppCompatActivity() {
} else {
Utils.showErrorDialog(
this@ExpeditionInfoActivity,
"Expedición no encontrada"
getString(R.string.expeditionNotFound)
)
}
@ -103,7 +103,7 @@ class ExpeditionInfoActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog(
this@ExpeditionInfoActivity,
resources.getString(R.string.error_conexion) + ".Vuelva a intentarlo de nuevo"
resources.getString(R.string.error_conexion) + getString(R.string.tryAgain)
)
}
})
@ -135,7 +135,7 @@ class ExpeditionInfoActivity : AppCompatActivity() {
if (listExpedition.isEmpty() || listExpedition.size < 1) {
var expedEmpty = ExpeditionInfoLog()
expedEmpty.created = "Sin registros"
expedEmpty.created = getString(R.string.noRows)
listExpedition.add(expedEmpty)
}
setAdapter(listExpedition)
@ -224,7 +224,7 @@ class ExpeditionInfoActivity : AppCompatActivity() {
txtScanned!!.setOnEditorActionListener { textView, i, keyEvent ->
Utils.progressBar.show(this, getResources().getString(R.string.please_wait))
expedition_getLog(txtScanned!!.text.toString())
textViewTitle!!.setText("Expedición :" + txtScanned!!.text.toString())
textViewTitle!!.setText(getString(R.string.expedition) + txtScanned!!.text.toString())
textScannedCurrent = txtScanned!!.text.toString()
route_getFromExpedition(textScannedCurrent)
txtScanned!!.setText("")
@ -244,12 +244,12 @@ class ExpeditionInfoActivity : AppCompatActivity() {
if (switchFound.isChecked) {
//Utils.showErrorDialog(this@ExpeditionInfoActivity, "Esta opción te permite eliminar las expediciones escaneadas.")
if (textScannedCurrent.isEmpty()) {
Utils.showErrorDialog(this@ExpeditionInfoActivity, "Escanee antes una expedición.")
Utils.showErrorDialog(this@ExpeditionInfoActivity, getString(R.string.scanExpedition))
} else {
val alertDialog = android.app.AlertDialog.Builder(this).create()
alertDialog.setTitle("Información")
alertDialog.setMessage("¿Desea marcar la expedición como encontrada?")
alertDialog.setTitle(getString(R.string.information))
alertDialog.setMessage(getString(R.string.markExpeditionFound))
alertDialog.setButton(
android.app.AlertDialog.BUTTON_POSITIVE, "SI"

21
app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionScanActivity.kt
View File

@ -4,30 +4,21 @@ import android.app.Activity
import android.content.Context
import android.media.MediaPlayer
import android.os.Bundle
import android.support.v7.app.AlertDialog
import android.support.v7.app.AppCompatActivity
import android.util.Log
import android.view.View
import android.view.View.GONE
import android.view.View.OnFocusChangeListener
import android.view.inputmethod.InputMethodManager
import android.widget.*
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
import verdnatura.es.repartoverdnatura.ADAPTERS.CheckAdapter
import verdnatura.es.repartoverdnatura.ADAPTERS.ExpeditionScannedAdapter
import verdnatura.es.repartoverdnatura.INTERFACES.RestClient
import verdnatura.es.repartoverdnatura.MODELS.Check
import verdnatura.es.repartoverdnatura.MODELS.Ruta
import verdnatura.es.repartoverdnatura.MainActivity.listaRutasCargadas
import verdnatura.es.repartoverdnatura.UTILS.ApiUtils
import verdnatura.es.repartoverdnatura.UTILS.LocalStorage
import verdnatura.es.repartoverdnatura.UTILS.Utils
import java.text.ParseException
import java.util.*
class ExpeditionScanActivity : AppCompatActivity() {
var mperror: MediaPlayer? = null
var mpok: MediaPlayer? = null
@ -97,13 +88,13 @@ class ExpeditionScanActivity : AppCompatActivity() {
txtRuta!!.setText("")
}else{
Utils.showErrorDialog(this@ExpeditionScanActivity, "Expedición no encontrada")
Utils.showErrorDialog(this@ExpeditionScanActivity, getString(R.string.expeditionFound))
txtRuta!!.setText("")
}
}
override fun onFailure(call: Call<Void>, t: Throwable) {
Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog(this@ExpeditionScanActivity, resources.getString(R.string.error_conexion)+".Vuelva a intentarlo de nuevo")
Utils.showErrorDialog(this@ExpeditionScanActivity, resources.getString(R.string.error_conexion)+ getString(R.string.tryAgain))
}
})
}
@ -137,7 +128,7 @@ class ExpeditionScanActivity : AppCompatActivity() {
mperror!!.start()
Toast.makeText(
baseContext,
"Expedición $textScanned ya escaneada como encontrada",
resources.getString(R.string.expeditionScanFound,textScanned),
Toast.LENGTH_SHORT
).show()
txtRuta!!.requestFocus()
@ -189,10 +180,10 @@ fun setAdapter(){
fun showMessageInfo() {
if (!switchLoad.isChecked){
Utils.showErrorDialog(this@ExpeditionScanActivity, "Esta opción te permite eliminar las expediciones escaneadas.")
txtMessage!!.setText("Eliminando")
Utils.showErrorDialog(this@ExpeditionScanActivity, getString(R.string.optionDeleteExpedition))
txtMessage!!.setText(getString(R.string.deleting))
}else{
txtMessage!!.setText("Escaneando")
txtMessage!!.setText(getString(R.string.scanning))
}
}

16
app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt
View File

@ -254,7 +254,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
.filter { it.checked == "1" || it.code == "ON DELIVERY" }.size
textLoaded!!.text =
checked.toString() + "/" + totalChecks.toString() + " cargadas"
checked.toString() + "/" + totalChecks.toString() + getString(R.string.loaded)
hideKeyboard()
@ -288,7 +288,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog(
this@ExpeditionSummaryActivity,
"No se ha encontrado información de la ruta"
getString(R.string.RouteNotInformation)
)
}
@ -323,7 +323,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
private fun setEvents() {
txtScan!!.setOnEditorActionListener { _, actionId, _ ->
if (!txtScan!!.text.isNullOrEmpty()) {
Toast.makeText(this, "Expedición :" + txtScan!!.text, Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.expedition) + txtScan!!.text, Toast.LENGTH_SHORT).show()
findExpedition(txtScan!!.text.toString())
itemScanned = true
}
@ -366,7 +366,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
)
) {
mpErrorRepeat?.start()
Toast.makeText(this, "Expedición ya cargada", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.expeditionLoaded), Toast.LENGTH_SHORT).show()
} else {
mpOk?.start()
@ -389,7 +389,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
listCheck[i].code = "ON DELIVERY"
checked += 1
textLoaded!!.text = "$checked/$totalChecks cargadas"
textLoaded!!.text = "$checked/$totalChecks"+getString(R.string.loaded)
if (checked >= totalChecks) {
totalSend = 1
Utils.progressBar.show(this, getResources().getString(R.string.please_wait))
@ -435,7 +435,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
Toast.makeText(
this@ExpeditionSummaryActivity,
"Consignatario cargado",
getString(R.string.adressLoaded),
Toast.LENGTH_SHORT
).show()
totalSend = 0
@ -447,7 +447,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog(
this@ExpeditionSummaryActivity,
resources.getString(R.string.error_conexion) + ".Vuelva a intentarlo"
resources.getString(R.string.error_conexion) + getString(R.string.tryAgain)
)
txtScan!!.requestFocus()
@ -458,7 +458,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog(
this@ExpeditionSummaryActivity,
resources.getString(R.string.error_conexion) + ".Vuelva a intentarlo"
resources.getString(R.string.error_conexion) + getString(R.string.tryAgain)
)
txtScan!!.requestFocus()
}

8
app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java
View File

@ -94,7 +94,7 @@ public class InfoActivity extends AppCompatActivity {
private void showSectors(final Context context) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Selecciona sector");
builder.setTitle(R.string.selectSector);
builder.setItems(listSectors.toArray(new String[0]), new DialogInterface.OnClickListener() {
@ -139,14 +139,14 @@ public class InfoActivity extends AppCompatActivity {
} else {
txtSectorInfo.setText(LocalStorage.getSectorDescrip(getApplicationContext()));
Utils.showErrorDialog(getBaseContext(), "Error al guarda. Pruebe de nuevo a seleccionar sector");
Utils.showErrorDialog(getBaseContext(), getString(R.string.mistakeSaving));
}
}
@Override
public void onFailure(Call<Void> call, Throwable t) {
Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(getBaseContext(), "Error al guarda. Pruebe de nuevo a seleccionar sector");
Utils.showErrorDialog(getBaseContext(), getString(R.string.mistakeSaving));
txtSectorInfo.setText(LocalStorage.getSectorDescrip(getApplicationContext()));
}
});
@ -171,7 +171,7 @@ public class InfoActivity extends AppCompatActivity {
txtSectorInfo.setText(response.body().getDescription());
} else {
Utils.showErrorDialog(getBaseContext(), "Error al guarda. Pruebe de nuevo a seleccionar sector");
Utils.showErrorDialog(getBaseContext(), getString(R.string.mistakeSaving));
txtSectorInfo.setText(LocalStorage.getSectorDescrip(getApplicationContext()));
}
}

47
app/src/main/java/verdnatura/es/repartoverdnatura/LoadVanActivity.kt
View File

@ -81,7 +81,7 @@ class LoadVanActivity : AppCompatActivity() {
if (checked >= totalChecks) {
// sergio: se cierra porque es automática cuando se escanea y no es necesario hacer nada más
Toast.makeText(this, "Expediciones de la ruta cargadas", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.expeditionLoaded), Toast.LENGTH_SHORT).show()
finish()
} else {
if (checked == 0) {
@ -89,10 +89,10 @@ class LoadVanActivity : AppCompatActivity() {
} else {
val alertDialog = android.app.AlertDialog.Builder(this).create()
alertDialog.setTitle("Información")
alertDialog.setMessage("El total de expediciones escaneadas es diferente al total de la ruta. ¿ Quieres guardar las expediciones escaneadas o buscar la/s expedición/es ?")
alertDialog.setTitle(getString(R.string.information))
alertDialog.setMessage(getString(R.string.expeditionTotal))
alertDialog.setButton(
android.app.AlertDialog.BUTTON_NEUTRAL, "GUARDAR "
android.app.AlertDialog.BUTTON_NEUTRAL, getString(R.string.save)
) { dialog, which ->
setRouteLoaded()
@ -136,7 +136,7 @@ class LoadVanActivity : AppCompatActivity() {
}
alertDialog.setButton(
android.app.AlertDialog.BUTTON_POSITIVE, "BUSCAR"
android.app.AlertDialog.BUTTON_POSITIVE, getString(R.string.find)
) { dialog, which ->
@ -174,7 +174,7 @@ class LoadVanActivity : AppCompatActivity() {
override fun onResponse(call: Call<Void>, response: Response<Void>) {
Utils.progressBar.dialog.dismiss()
if (response.isSuccessful) {
Toast.makeText(baseContext, "Expedición descargada", Toast.LENGTH_SHORT)
Toast.makeText(baseContext, getString(R.string.expeditionUnload), Toast.LENGTH_SHORT)
.show()
mpok?.start()
adapter!!.notifyDataSetChanged()
@ -185,7 +185,7 @@ class LoadVanActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog(
this@LoadVanActivity,
resources.getString(R.string.error_conexion) + ".Vuelva a intentarlo de nuevo"
resources.getString(R.string.error_conexion) + getString(R.string.tryAgain)
)
}
})
@ -217,7 +217,7 @@ class LoadVanActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog(
this@LoadVanActivity,
resources.getString(R.string.error_conexion) + ".Vuelva a intentarlo"
resources.getString(R.string.error_conexion) + getString(R.string.tryAgain)
)
}
})
@ -322,7 +322,6 @@ class LoadVanActivity : AppCompatActivity() {
//se transforma el número de la position para la lista completa
if (position>=0){
Log.d("VERDNATURA::","Encontrado")
position= listCheck.indexOfFirst { it.id == textScanned }
}
@ -349,7 +348,7 @@ class LoadVanActivity : AppCompatActivity() {
private fun markExpeditionLoaded(i: Int) {
if (listCheck[i].checked == "1") {
mpErrorRepeat?.start()
Toast.makeText(this, "Expedición ya cargada", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.expeditionLoaded), Toast.LENGTH_SHORT).show()
} else {
mpok?.start()
@ -358,13 +357,13 @@ class LoadVanActivity : AppCompatActivity() {
checked += 1
}
adapter!!.notifyDataSetChanged()
txtLineas!!.text = checked.toString() + "/" + totalChecks + " cargadas"
txtLineas!!.text = checked.toString() + "/" + totalChecks + getString(R.string.loaded)
if (checked >= totalChecks) {
if (loadForAdressing){
Toast.makeText(this, "Consignatario cargado", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.addressLoaded), Toast.LENGTH_SHORT).show()
}else{
Toast.makeText(this, "Ruta cargada", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.routeLoaded), Toast.LENGTH_SHORT).show()
}
totalSend = 1
@ -386,11 +385,11 @@ class LoadVanActivity : AppCompatActivity() {
Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
expeditionStateUnmarking_addByExpedition(listCheck[i].id, "FOUND")
} else {
Toast.makeText(this, "Expedición no cargada", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.expeditionNotLoaded), Toast.LENGTH_SHORT).show()
}
adapter!!.notifyDataSetChanged()
txtLineas!!.text = checked.toString() + "/" + totalChecks + " cargadas"
txtLineas!!.text = checked.toString() + "/" + totalChecks + getString(R.string.loaded)
txtRuta!!.requestFocus()
hideKeyboard()
@ -427,15 +426,15 @@ class LoadVanActivity : AppCompatActivity() {
}
pos += 1
}
txtLineas!!.text = checked.toString() + "/" + listCheck.size + " cargadas"
txtLineas!!.text = checked.toString() + "/" + listCheck.size + getString(R.string.loaded)
if (!isFind) {
Toast.makeText(this, "No Encontrada", Toast.LENGTH_LONG).show()
Toast.makeText(this, getString(R.string.expeditionNotFound), Toast.LENGTH_LONG).show()
}
if (checked >= listCheck.size) {
if (loadForAdressing){
Toast.makeText(this, "Consignatario cargado", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.addressLoaded), Toast.LENGTH_SHORT).show()
}else{
Toast.makeText(this, "Ruta cargada", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.routeLoaded), Toast.LENGTH_SHORT).show()
}
totalSend = 1
@ -536,7 +535,7 @@ class LoadVanActivity : AppCompatActivity() {
list.filter { it.addressFk == adressOfLoad }.filter { it.routeFk == route }
.filter { it.checked == "1" || it.code == "ON DELIVERY" }.size
txtLineas!!.text = checked.toString() + "/" + totalChecks + " cargadas"
txtLineas!!.text = checked.toString() + "/" + totalChecks + getString(R.string.loaded)
adapter = CheckAdapter(
this,
@ -559,7 +558,7 @@ class LoadVanActivity : AppCompatActivity() {
.filter { it.checked == "1" || it.code == "ON DELIVERY" }.size
//txtLineas!!.text = checked.toString() + "/" + listCheck.size + " cargadas"
txtLineas!!.text = checked.toString() + "/" + totalChecks + " cargadas"
txtLineas!!.text = checked.toString() + "/" + totalChecks + getString(R.string.loaded)
adapter = CheckAdapter(this, listCheck.filter { it.routeFk == route })
this.listView!!.adapter = adapter
txtIdRuta!!.visibility = GONE
@ -576,11 +575,11 @@ class LoadVanActivity : AppCompatActivity() {
if (!switchLoad.isChecked) {
Utils.showErrorDialog(
this@LoadVanActivity,
"Esta opción te permite descargar expediciones de la furgoneta."
getString(R.string.optionUnload)
)
txtMessage!!.setText("Descargando")
txtMessage!!.setText(getString(R.string.unloading))
} else {
txtMessage!!.setText("Cargando furgo")
txtMessage!!.setText(getString(R.string.loadVan))
}
}

16
app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java
View File

@ -87,7 +87,7 @@ public class LoginActivity extends AppCompatActivity {
}
public void logInSalix(@Nullable View v) {
Utils.progressBar.show(this, "Check user");
Utils.progressBar.show(this, getString(R.string.checkUser));
final String user = txtUser.getText().toString();
final String password = txtPassword.getText().toString();
LoginSalix ls = new LoginSalix(user, password, "", false, "");
@ -108,7 +108,6 @@ public class LoginActivity extends AppCompatActivity {
} else {
Utils.showErrorDialog(that, that.getResources().getString(R.string.usuario_incorrecto));
Log.e("API", "Response is not successful " + response.message());
}
}
@ -125,7 +124,7 @@ public class LoginActivity extends AppCompatActivity {
public void worker_getId() {
Utils.progressBar.show(this, "Check user");
Utils.progressBar.show(this, getString(R.string.checkUser));
final String user = txtUser.getText().toString();
final String password = txtPassword.getText().toString();
@ -145,7 +144,6 @@ public class LoginActivity extends AppCompatActivity {
} else {
Utils.showErrorDialog(that, that.getResources().getString(R.string.workerId_incorrect));
Log.e("API", "Response is not successful " + response.message());
}
}
@ -181,10 +179,10 @@ public class LoginActivity extends AppCompatActivity {
if (!v.getVersion().equals(info.versionName)){
AlertDialog.Builder builderVersion = new AlertDialog.Builder(that);
builderVersion.setMessage("Existe una nueva versión. Se recomienda actualizar.");
builderVersion.setMessage(R.string.newVersion);
builderVersion.setCancelable(false);
builderVersion.setPositiveButton(
"Actualizar",
R.string.update,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(v.getUrl())));
@ -193,14 +191,14 @@ public class LoginActivity extends AppCompatActivity {
});
if (!v.getVersionIsCritical().equals("1")){
builderVersion.setNegativeButton("Cancelar", new DialogInterface.OnClickListener() {
builderVersion.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
startActivity(new Intent(that, MainActivity.class));
}
});
}else{
builderVersion.setMessage("Existe una nueva versión. Es necesario actualizar para un correcto funcionamiento");
builderVersion.setMessage(R.string.newVersionMandatory);
}
AlertDialog alertVersion = builderVersion.create();
alertVersion.show();
@ -224,7 +222,7 @@ public class LoginActivity extends AppCompatActivity {
}
public void deviceLog_add() {
Utils.progressBar.show(this, "Añadiendo log");
Utils.progressBar.show(this, getString(R.string.addLog));
final String user = Utils.getUser(this);
final String password = Utils.getPass(this);

16
app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
View File

@ -353,9 +353,9 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
if (listaPendientes.size() > 0) {
new AlertDialog.Builder(this)
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle("ATENCIÓN")
.setMessage("Tienes tickets pendientes de actualizar,¿Estás seguro de cerrar sesión?")
.setPositiveButton("Si", new DialogInterface.OnClickListener() {
.setTitle(R.string.attention)
.setMessage(R.string.ticketPending)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Utils.logOut(that);
@ -363,14 +363,14 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
}
})
.setNegativeButton("No", null)
.setNegativeButton(R.string.not, null)
.show();
} else {
new AlertDialog.Builder(this)
.setIcon(android.R.drawable.ic_dialog_alert)
.setTitle("Cerrar sesión")
.setMessage("¿Estás seguro de cerrar sesión?")
.setPositiveButton("Si", new DialogInterface.OnClickListener() {
.setTitle(R.string.closeSession)
.setMessage(R.string.sessionExit)
.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Utils.logOut(that);
@ -378,7 +378,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
}
})
.setNegativeButton("No", null)
.setNegativeButton(getString(R.string.not), null)
.show();
}

3
app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java
View File

@ -37,11 +37,9 @@ public class NetworkStateReveiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
this.context = context;
Log.d("VERDNATURA::", "Network connectivity change");
if (intent.getExtras() != null) {
NetworkInfo ni = (NetworkInfo) intent.getExtras().get(ConnectivityManager.EXTRA_NETWORK_INFO);
if (ni != null && ni.getState() == NetworkInfo.State.CONNECTED) {
Log.i("VERDNATURA::", "Network " + ni.getTypeName() + " connected");
//TENEMOS INTERNET
Set<String> listPendientes = LocalStorage.getPendingSigns(context);
if (listPendientes.size() != 0){
@ -58,7 +56,6 @@ public class NetworkStateReveiver extends BroadcastReceiver {
confirmSave(0);
} else if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, Boolean.FALSE)) {
Log.d("app", "There's no network connectivity");
}
}
}

10
app/src/main/java/verdnatura/es/repartoverdnatura/NoteActivity.java
View File

@ -64,11 +64,11 @@ public class NoteActivity extends AppCompatActivity {
}
private void setMensajes(){
listMensajes.add("CLIENTE AUSENTE");
listMensajes.add("CLIENTE AUTORIZA DESCARGA A REPARTIDOR");
listMensajes.add("CLIENTE RECHAZA PEDIDO");
listMensajes.add("FALTAN BULTOS: ");
listMensajes.add("RECOGER DEVOLUCIÓN, NÚMERO DE RECLAMACIÓN: ");
listMensajes.add(getString(R.string.ClientNot));
listMensajes.add(getString(R.string.clientAuthorization));
listMensajes.add(getString(R.string.clientReject));
listMensajes.add(getString(R.string.packagesMissing));
listMensajes.add(getString(R.string.clientDevolution));
ArrayAdapter<String> adapter = new ArrayAdapter<>(this,R.layout.row_mensaje,listMensajes);
listViewMnesaje.setAdapter(adapter);

10
app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
View File

@ -432,7 +432,7 @@ public class Tickets extends AppCompatActivity {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
makeCall();
} else {
Toast.makeText(this, "No tienes permisos para llamar.", Toast.LENGTH_LONG).show();
Toast.makeText(this, R.string.phonePermission, Toast.LENGTH_LONG).show();
}
}
}
@ -472,9 +472,9 @@ public class Tickets extends AppCompatActivity {
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage("Please install Google Maps");
builder.setMessage(R.string.installMaps);
builder.setCancelable(false);
builder.setPositiveButton("Install", new DialogInterface.OnClickListener() {
builder.setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.google.android.apps.maps"));
@ -539,9 +539,9 @@ public class Tickets extends AppCompatActivity {
mensaje = listClientesTickets.get(pos).getNote();
}
AlertDialog alertDialog = new AlertDialog.Builder(this).create();
alertDialog.setTitle("Alert");
alertDialog.setTitle(getString(R.string.alert));
alertDialog.setMessage(mensaje);
alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, "OK",
alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.buttonOk),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

24
app/src/main/java/verdnatura/es/repartoverdnatura/UnLoadVanActivity.kt
View File

@ -79,15 +79,15 @@ class UnLoadVanActivity : AppCompatActivity() {
//sergio:último cambio después de que Felipe diera el ok
if (delivered >= (listCheck.filter{it.addressFk==adressToExpeditions}.filter{it.routeFk==routeOfLoad}).size){
Toast.makeText(this,"Expediciones de la ruta y cliente escaneada",Toast.LENGTH_SHORT).show()
Toast.makeText(this,getString(R.string.expeditionsScanned),Toast.LENGTH_SHORT).show()
goSign()
} else{
val alertDialog = android.app.AlertDialog.Builder(this).create()
alertDialog.setTitle("Información")
alertDialog.setMessage("El total de expediciones escaneadas es diferente al total a entregar. ¿ Quieres guardar las expediciones escaneadas o buscar la/s expedición/es ?")
alertDialog.setTitle(getString(R.string.information))
alertDialog.setMessage(getString(R.string.expeditionTotal))
alertDialog.setButton(
android.app.AlertDialog.BUTTON_NEUTRAL,"GUARDAR"
android.app.AlertDialog.BUTTON_NEUTRAL,getString(R.string.save)
) { dialog, which ->
if (listCheck.filter{it.addressFk==adressToExpeditions}.filter{it.code=="DELIVERED"}.isEmpty()){
@ -99,7 +99,7 @@ class UnLoadVanActivity : AppCompatActivity() {
}
alertDialog.setButton(
android.app.AlertDialog.BUTTON_POSITIVE,"BUSCAR"
android.app.AlertDialog.BUTTON_POSITIVE,getString(R.string.find)
) { dialog, which ->
@ -142,7 +142,7 @@ class UnLoadVanActivity : AppCompatActivity() {
private fun showMessageError(){
Utils.progressBar.dialog.dismiss()
Toast.makeText(this@UnLoadVanActivity, "Error al enviar. Se queda guardado para enviar más tarde", Toast.LENGTH_SHORT).show()
Toast.makeText(this@UnLoadVanActivity, getString(R.string.mistakeSending), Toast.LENGTH_SHORT).show()
saveExpeditionPendings()
goSign()
}
@ -193,7 +193,7 @@ class UnLoadVanActivity : AppCompatActivity() {
switchLoad = findViewById<View>(R.id.switchLoad) as Switch
switchLoad.visibility=GONE
txtTitle!!.setText("Escáner entregado")
txtTitle!!.setText(getString(R.string.scannerIn))
var btnUpload = findViewById<ImageView>(R.id.imageVanLoaded)
btnUpload.setOnClickListener{
@ -252,7 +252,7 @@ class UnLoadVanActivity : AppCompatActivity() {
private fun markExpeditionUnLoaded(i:Int){
if (listCheck[i].delivered == "1") {
mpErrorRepeat?.start()
Toast.makeText(this, "Expedición ya escaneada para entrega", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.expeditionScanned), Toast.LENGTH_SHORT).show()
} else {
mpok?.start()
@ -265,9 +265,10 @@ class UnLoadVanActivity : AppCompatActivity() {
}
adapter!!.notifyDataSetChanged()
txtLineas!!.text = delivered.toString() + "/" + listCheck.filter { it.addressFk==adressToExpeditions }.filter{it.routeFk==routeOfLoad}.size + " entregadas"
txtLineas!!.text = delivered.toString() + "/" + listCheck.filter { it.addressFk==adressToExpeditions }.filter{it.routeFk==routeOfLoad}.size + getString(
R.string.delivered)
if (delivered >= listCheck.filter { it.addressFk==adressToExpeditions }.filter{it.routeFk==routeOfLoad}.size) {
Toast.makeText(this, "Escaneo a entregar completo", Toast.LENGTH_SHORT).show()
Toast.makeText(this, getString(R.string.scannerComplete), Toast.LENGTH_SHORT).show()
expeditionState_addByExpeditionMulti(listCheck.filter{it.routeFk==routeOfLoad}.filter{it.addressFk==adressToExpeditions }.filter{it.code=="DELIVERED"},"DELIVERED")
}
txtRuta!!.requestFocus()
@ -353,7 +354,8 @@ class UnLoadVanActivity : AppCompatActivity() {
delivered = list.filter { it.addressFk == adress }
.filter { it.delivered == "1"}.filter{it.routeFk==routeOfLoad}.size
txtLineas!!.text = delivered.toString() + "/" + (listCheck.filter { it.addressFk==adress }.filter{it.routeFk==routeOfLoad}).size + " escaneadas"
txtLineas!!.text = delivered.toString() + "/" + (listCheck.filter { it.addressFk==adress }.filter{it.routeFk==routeOfLoad}).size + getString(
R.string.scanned)
//adapter = CheckAdapter(this, this.listCheck)
adapter = CheckAdapter(this, listCheck.filter { it.addressFk==adress }.filter{it.routeFk==routeOfLoad})

20
app/src/main/res/layout/activity_expedition_info.xml
View File

@ -23,7 +23,7 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/roboto"
android:text="Ver log expedición"
android:text="@string/showLogExpedition"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
@ -33,7 +33,7 @@
android:id="@+id/switchDescrip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Marcar encontrada"
android:text="@string/markFound"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:layout_marginLeft="10dp"
@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:textSize="13sp"
android:hint="Escanea expedición para ver log o marcarla encontrada "
android:hint="@string/showExpeditionLog"
android:inputType="textPersonName"
android:minHeight="48dp"
android:textColor="@color/colorAccent"
@ -106,7 +106,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Ruta"
android:text="@string/rutas"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -116,7 +116,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Agencia"
android:text="@string/agency"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -126,7 +126,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Matrícula"
android:text="@string/plate"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold"
@ -137,7 +137,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Fecha"
android:text="@string/date"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -147,7 +147,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Hora"
android:text="@string/hora"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -179,7 +179,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Fecha"
android:text="@string/date"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -200,7 +200,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Estado"
android:text="@string/state"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />

24
app/src/main/res/layout/activity_expedition_summary.xml
View File

@ -23,7 +23,7 @@
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:fontFamily="@font/roboto"
android:text="R:"
android:text="@string/routeAbbrev"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
@ -52,7 +52,7 @@
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:fontFamily="@font/roboto"
android:text="C:"
android:text="@string/consigneeAbrev"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:visibility="gone"
@ -82,7 +82,7 @@
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:fontFamily="@font/roboto"
android:text="Para cargar pulsa consignatario"
android:text="@string/forLoading"
android:textColor="@color/colorMainBg"
android:textSize="@dimen/text_size"
app:layout_constraintBottom_toBottomOf="parent"
@ -133,7 +133,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="Escanear expedición"
android:hint="@string/scanExpeditionText"
android:inputType="text"
android:textColor="@color/colorAccent"
android:textColorHint="@color/colorGray"
@ -145,7 +145,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="Escanear expedición"
android:hint="@string/scanExpeditionText"
android:inputType="number"
android:textColor="@color/colorAccent"
android:textColorHint="@color/colorGray"
@ -164,7 +164,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Consign"
android:text="@string/consignAbbr"
android:textColor="@color/colorMainBg"
android:textSize="18sp"
android:textStyle="bold" />
@ -174,7 +174,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Ruta"
android:text="@string/route"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold"
@ -186,7 +186,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cajas"
android:text="@string/box"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -196,7 +196,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Tipo"
android:text="@string/type"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -206,7 +206,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Escan"
android:text="@string/scanAbrev"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -216,7 +216,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Perdidas"
android:text="@string/lost"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />
@ -226,7 +226,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Entregadas"
android:text="@string/deliveredMenu"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
android:textStyle="bold" />

20
app/src/main/res/layout/activity_info.xml
View File

@ -137,7 +137,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Razón social:"
android:text="@string/socialAdress"
android:textColor="@color/colorWhite"
android:textStyle="bold" />
@ -145,13 +145,13 @@
android:id="@+id/txtRazonSocial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="selecciona una ruta"
android:text="@string/selectRoute"
android:textColor="@color/colorWhite" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="NIF:"
android:text="@string/nif"
android:textColor="@color/colorWhite"
android:textStyle="bold" />
@ -159,13 +159,13 @@
android:id="@+id/txtNif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="selecciona una ruta"
android:text="@string/selectRoute"
android:textColor="@color/colorWhite" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Dirección fiscal:"
android:text="@string/fiscalAdress"
android:textColor="@color/colorWhite"
android:textStyle="bold" />
@ -173,13 +173,13 @@
android:id="@+id/txtDireccionFiscal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="selecciona una ruta"
android:text="@string/selectRoute"
android:textColor="@color/colorWhite" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Municipio:"
android:text="@string/town"
android:textColor="@color/colorWhite"
android:textStyle="bold" />
@ -187,13 +187,13 @@
android:id="@+id/txtMunicipio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="selecciona una ruta"
android:text="@string/selectRoute"
android:textColor="@color/colorWhite" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Código postal:"
android:text="@string/postalCode"
android:textColor="@color/colorWhite"
android:textStyle="bold" />
@ -201,7 +201,7 @@
android:id="@+id/txtCodigoPostal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="selecciona una ruta"
android:text="@string/selectRoute"
android:textColor="@color/colorWhite" />

6
app/src/main/res/layout/activity_note.xml
View File

@ -93,7 +93,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/roboto"
android:text="140 carácteres restantes"
android:text="@string/characters"
android:textColor="@color/colorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -107,7 +107,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/roboto_bold"
android:text="Mensajes predeterminados:"
android:text="@string/defaultMessages"
android:textColor="@color/colorMainBg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -120,7 +120,7 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/roboto"
android:text="(selecciona uno)"
android:text="@string/selectOne"
android:textColor="@color/colorGray"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/activity_scan.xml
View File

@ -23,7 +23,7 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/roboto"
android:text="Escanear expedición encontrada"
android:text="@string/scanHint"
android:textColor="@color/colorMainBg"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
@ -72,7 +72,7 @@
android:id="@+id/textView41"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Escanea expedición encontrada"
android:text="@string/expeditionFoundScan"
android:textColor="@color/colorMainBg"
android:textSize="18sp"
android:visibility="gone"/>

2
app/src/main/res/layout/phone_row.xml
View File

@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/roboto_bold"
android:text="Comercial"
android:text="@string/salePerson"
android:textColor="@color/colorPrimaryDark"
android:textSize="18sp" />

8
app/src/main/res/layout/row_check.xml
View File

@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Exped: "
android:text="@string/expedAbbr"
android:textColor="@color/colorMainBg"
android:textSize="13sp" />
@ -71,7 +71,7 @@
android:id="@+id/txtItemDescrip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tipo de embalaje: "
android:text="@string/packingType"
android:textColor="@color/colorMainBg"
android:textSize="20sp"
android:textStyle="bold" />
@ -126,7 +126,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Almacén: "
android:text="@string/warehouseText"
android:textColor="@color/colorMainBg"
android:textSize="18sp"
android:visibility="gone"/>
@ -150,7 +150,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Bultos: "
android:text="@string/packages"
android:textColor="@color/colorMainBg"
android:textSize="18sp"
android:visibility="gone"/>

4
app/src/main/res/layout/row_expedition_info.xml
View File

@ -79,7 +79,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Almacén: "
android:text="@string/warehouseText"
android:textColor="@color/colorMainBg"
android:textSize="18sp"
android:visibility="gone"/>
@ -103,7 +103,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Bultos: "
android:text="@string/packages"
android:textColor="@color/colorMainBg"
android:textSize="18sp"
android:visibility="gone"/>

2
app/src/main/res/layout/row_expedition_summary.xml
View File

@ -98,7 +98,7 @@
android:layout_height="24dp"
android:layout_marginRight="2dp"
android:onClick="onLoadSelected"
android:tooltipText="Permite escanear expediciones del consigntario seleccionado"
android:tooltipText="@string/permission"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageExit"
app:layout_constraintTop_toTopOf="parent"

4
app/src/main/res/layout/row_expeditionscanned.xml
View File

@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Expedición : "
android:text="@string/expedition"
android:textColor="@color/colorMainBg"
android:textSize="18sp" />
@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Encontrada"
android:text="@string/found"
android:textColor="@color/colorMainBg"
android:textSize="20sp"
android:textStyle="bold" />

2
app/src/main/res/layout/row_route.xml
View File

@ -191,7 +191,7 @@
android:fontFamily="@font/roboto"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="Escáner reparto"
android:text="@string/scanLoad"
android:textColor="@color/colorPrimary"/>
</LinearLayout>

98
app/src/main/res/values-en/strings.xml
View File

@ -11,7 +11,6 @@
<string name="pendientes_actualizar">Pending update</string>
<string name="tickets_firmados_pendientes">Signed tickets pending update</string>
<string name="numero_paleta">Palet number</string>
<string name="m3">m3</string>
<string name="ver_tickets">show tickets</string>
<string name="actualizar_tickets">Update ticket</string>
<string name="configurar_ruta">configure</string>
@ -19,6 +18,8 @@
<string name="ver_firmados">show signed</string>
<string name="cliente">Client</string>
<string name="consignatorio">Consigne</string>
<string name="packages">Packages</string>
<string name="warehouse">Almacén</string>
<string name="volver">back</string>
<string name="please_wait">please wait</string>
<string name="error_conexion">connection error</string>
@ -32,6 +33,7 @@
<string name="guardar">Save</string>
<string name="estas_seguro_firma">¿Are you sure to sign?</string>
<string name="si">Yes</string>
<string name="no">No</string>
<string name="info">Info</string>
<string name="actualizar">Update</string>
<string name="ver_loc">How do you want to get the position?</string>
@ -63,7 +65,99 @@
<string name="scanLoad">Scan delivery</string>
<string name="workerId_incorrect">It\'s not possilble to get worker id</string>
<string name="log_incorrect">It\'s not possilble to log the session</string>
<string name="summaryRouteTitle">Resumen carga ruta:</string>
<string name="summaryRouteTitle">Summary route:</string>
<string name="consignatorioAbrev">Address:</string>
<string name="distance">Distance to the last point signed:</string>
<string name="selecTime">Select Time</string>
<string name="expeditionNotFound">Expedition not found</string>
<string name="tryAgain">.Try again</string>
<string name="noRows">No records</string>
<string name="expedition">Expedition :</string>
<string name="scanExpedition">Scan an expedition before.</string>
<string name="information">Information</string>
<string name="markExpeditionFound">Do you want to mark the expedition as found?</string>
<string name="expeditionFound">Expedition not found</string>
<string name="optionDeleteExpedition">This option allows you to delete scanned expeditions.</string>
<string name="deleting">Deleting</string>
<string name="scanning">Scanning</string>
<string name="loaded"> loaded</string>
<string name="RouteNotInformation">Route information not found</string>
<string name="expeditionLoaded">Expedition already loaded</string>
<string name="adressLoaded">Consignee loaded</string>
<string name="expeditionScanFound">Expedition %1$s already scanned as found</string>
<string name="selectSector">Select sector</string>
<string name="mistakeSaving">Error while saving. Please try selecting the sector again.</string>
<string name="ClientNot">ABSENT CLIENT</string>
<string name="clientAuthorization">CLIENT AUTHORIZES DELIVERY TO DRIVER</string>
<string name="clientReject">CLIENT REJECTS ORDER</string>
<string name="packagesMissing">MISSING PACKAGES: </string>
<string name="clientDevolution">PICK UP RETURN, CLAIM NUMBER:</string>
<string name="expeditionsScanned">Expeditions for the route and client scanned</string>
<string name="expeditionTotal">The total number of scanned expeditions is different from the total to be delivered. Do you want to save the scanned expeditions or search for the expeditions?</string>
<string name="save">SAVE</string>
<string name="mistakeSending">Error while sending. It will be saved to send later.</string>
<string name="scannerIn">Scanner delivered</string>
<string name="expeditionScanned">Expedition already scanned for delivery</string>
<string name="delivered"> delivered</string>
<string name="scannerComplete">Complete delivery scanning</string>
<string name="scanned"> scanned </string>
<string name="phonePermission">You don\'t have permission to make calls.</string>
<string name="installMaps">Please install Google Maps</string>
<string name="install">Install</string>
<string name="alert">Alert</string>
<string name="checkUser">Checking user</string>
<string name="newVersion">A new version is available. It is recommended to update.</string>
<string name="update">Update</string>
<string name="cancel">Cancel</string>
<string name="newVersionMandatory">A new version is available. It is necessary to update for proper functioning.</string>
<string name="addLog">Adding log</string>
<string name="find">SEARCH</string>
<string name="expeditionUnload">Expedition unloaded</string>
<string name="routeLoaded">Route loaded</string>
<string name="addressLoaded">Consignee loaded</string>
<string name="expeditionNotLoaded">Expedition not loaded</string>
<string name="optionUnload">This option allows you to unload expeditions from the van.</string>
<string name="unloading">Unloading</string>
<string name="loadVan">Loading van</string>
<string name="attention">ATTENTION</string>
<string name="ticketPending">You have pending tickets to update. Are you sure you want to log out?</string>
<string name="yes">Yes</string>
<string name="not">No</string>
<string name="closeSession">Close session</string>
<string name="sessionExit">Are you sure you want to log out?</string>
<string name="forLoading">To load, press consignee</string>
<string name="box">Boxes</string>
<string name="type">Type</string>
<string name="lost">Lost</string>
<string name="deliveredMenu">Delivered</string>
<string name="consignAbbr">Consign</string>
<string name="permission">Allows scanning expeditions for the selected consignee</string>
<string name="scanExpeditionText">Scan expedition</string>
<string name="markFound">Mark as found</string>
<string name="selectRoute">Select a route</string>
<string name="scanHint">Scan found expedition</string>
<string name="route">Route</string>
<string name="defaultMessages">Default messages:</string>
<string name="salePerson">Salesperson</string>
<string name="expedAbbr">Exped:</string>
<string name="found">Found</string>
<string name="warehouseText">Warehouse:</string>
<string name="characters">140 remaining characters</string>
<string name="showLogExpedition">View expedition log</string>
<string name="agency">Agency</string>
<string name="showExpeditionLog">Scan the expedition to view the log or mark it as found</string>
<string name="plate">Plate</string>
<string name="state">State</string>
<string name="date">Date</string>
<string name="nif">NIF:</string>
<string name="fiscalAdress">Fiscal address:</string>
<string name="town">City:</string>
<string name="postalCode">Postal code:</string>
<string name="socialAdress">Social address:</string>
<string name="expeditionFoundScan">Scan found expedition</string>
<string name="routeAbbrev">R:</string>
<string name="consigneeAbrev">C:</string>
<string name="scanAbrev">Scan</string>
<string name="selectOne">(select one)</string>
<string name="buttonOk">OK</string>
</resources>

98
app/src/main/res/values/strings.xml
View File

@ -21,8 +21,8 @@
<string name="consignatorioAbrev">Consign:</string>
<string name="pc" translatable="false">PC</string>
<string name="ticket" translatable="false">Ticket</string>
<string name="packages" translatable="false">Bultos</string>
<string name="warehouse" translatable="false">Warehouse</string>
<string name="packages">Bultos</string>
<string name="warehouse">Warehouse</string>
<string name="volver">volver</string>
<string name="please_wait">trabajando</string>
<string name="error_conexion">error de conexión</string>
@ -38,7 +38,7 @@
<string name="guardar">Guardar</string>
<string name="estas_seguro_firma">¿Estás seguro de firmar?</string>
<string name="si">Si</string>
<string name="no" translatable="false">No</string>
<string name="no">No</string>
<string name="info">Información</string>
<string name="actualizar">Actualizar</string>
<string name="ver_loc">¿Cómo quieres obtener la posición?</string>
@ -70,4 +70,96 @@
<string name="packingType">Tipo embalaje:</string>
<string name="summaryRouteTitle">Resumen carga ruta:</string>
<string name="distance">Distancia al último punto en que se firmó la descarga en metros:</string>
<string name="selecTime">Selecciona la hora</string>
<string name="expeditionNotFound">Expedición no encontrada</string>
<string name="tryAgain">.Vuelva a intentarlo de nuevo</string>
<string name="noRows">Sin registros</string>
<string name="expedition">Expedición :</string>
<string name="scanExpedition">Escanee antes una expedición.</string>
<string name="information">Información</string>
<string name="markExpeditionFound">¿Desea marcar la expedición como encontrada?</string>
<string name="expeditionFound">Expedición no encontrada</string>
<string name="optionDeleteExpedition">Esta opción te permite eliminar las expediciones escaneadas.</string>
<string name="deleting">Eliminando</string>
<string name="scanning">Escaneando</string>
<string name="loaded"> cargadas"</string>
<string name="RouteNotInformation">No se ha encontrado información de la ruta</string>
<string name="expeditionLoaded">Expedición ya cargada</string>
<string name="adressLoaded">Consignatario cargado</string>
<string name="expeditionScanFound">Expedición %1$s ya escaneada como encontrada</string>
<string name="selectSector">Selecciona sector</string>
<string name="mistakeSaving">Error al guarda. Pruebe de nuevo a seleccionar sector</string>
<string name="ClientNot">CLIENTE AUSENTE</string>
<string name="clientAuthorization">CLIENTE AUTORIZA DESCARGA A REPARTIDOR</string>
<string name="clientReject">CLIENTE RECHAZA PEDIDO</string>
<string name="packagesMissing">FALTAN BULTOS:</string>
<string name="clientDevolution">RECOGER DEVOLUCIÓN, NÚMERO DE RECLAMACIÓN:</string>
<string name="expeditionsScanned">Expediciones de la ruta y cliente escaneada</string>
<string name="expeditionTotal">El total de expediciones escaneadas es diferente al total a entregar. ¿ Quieres guardar las expediciones escaneadas o buscar la/s expedición/es ?</string>
<string name="save">GUARDAR</string>
<string name="mistakeSending">Error al enviar. Se queda guardado para enviar más tarde</string>
<string name="scannerIn">Escáner entregado</string>
<string name="expeditionScanned">Expedición ya escaneada para entrega</string>
<string name="delivered"> entregada</string>
<string name="scannerComplete">Escaneo a entregar completo</string>
<string name="scanned"> escaneadas\</string>
<string name="phonePermission">No tienes permisos para llamar.</string>
<string name="installMaps">Please install Google Maps</string>
<string name="install">Install</string>
<string name="alert">Alert</string>
<string name="checkUser">Comprobando usuario</string>
<string name="newVersion">Existe una nueva versión. Se recomienda actualizar.</string>
<string name="update">Actualizar</string>
<string name="cancel">Cancelar</string>
<string name="newVersionMandatory">Existe una nueva versión. Es necesario actualizar para un correcto funcionamiento</string>
<string name="addLog">Añadiendo log</string>
<string name="find">BUSCAR</string>
<string name="expeditionUnload">Expedición descargada</string>
<string name="routeLoaded">Ruta cargada</string>
<string name="addressLoaded">Consignatario cargado</string>
<string name="expeditionNotLoaded">Expedición no cargada</string>
<string name="optionUnload">Esta opción te permite descargar expediciones de la furgoneta.</string>
<string name="unloading">Descargando</string>
<string name="loadVan">Cargando furgo</string>
<string name="attention">ATENCIÓN</string>
<string name="ticketPending">Tienes tickets pendientes de actualizar,¿Estás seguro de cerrar sesión?</string>
<string name="yes">Si</string>
<string name="not">No</string>
<string name="closeSession">Cerrar sesión</string>
<string name="sessionExit">¿Estás seguro de cerrar sesión?</string>
<string name="forLoading">Para cargar pulsa consignatario</string>
<string name="box">Cajas</string>
<string name="type">Tipo</string>
<string name="lost">Perdidas</string>
<string name="deliveredMenu">Entregadas</string>
<string name="consignAbbr">Consign</string>
<string name="permission">Permite escanear expediciones del consigntario seleccionado</string>
<string name="scanExpeditionText">Escanear expedición</string>
<string name="markFound">Marcar encontrada</string>
<string name="selectRoute">selecciona una ruta</string>
<string name="scanHint">Escanear expedición encontrada</string>
<string name="route">Ruta</string>
<string name="defaultMessages">Mensajes predeterminados:</string>
<string name="salePerson">Comercial</string>
<string name="expedAbbr">Exped:</string>
<string name="found">Encontrada</string>
<string name="warehouseText">Almacén:</string>
<string name="characters">140 carácteres restantes</string>
<string name="showLogExpedition">Ver log expedición</string>
<string name="agency">Agencia</string>
<string name="showExpeditionLog">Escanea expedición para ver log o marcarla encontrada</string>
<string name="plate">Matrícula</string>
<string name="state">Estado</string>
<string name="date">Fecha</string>
<string name="nif">NIF:</string>
<string name="fiscalAdress">Dirección fiscal:</string>
<string name="town">Municipio:</string>
<string name="postalCode">Código postal:</string>
<string name="socialAdress">Razón social:</string>
<string name="expeditionFoundScan">Escanea expedición encontrada</string>
<string name="routeAbbrev">R:</string>
<string name="consigneeAbrev">C:</string>
<string name="scanAbrev">Escan</string>
<string name="selectOne">(selecciona uno)</string>
<string name="buttonOk">OK</string>
</resources>