From 402ea6a1264021a6f49dd34582b9e60633806584 Mon Sep 17 00:00:00 2001 From: Amab Date: Thu, 27 Nov 2014 20:35:20 +0100 Subject: [PATCH 1/9] Added sorting of events list --- .../java/es/ugr/swad/swadroid/database/DataBaseHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java b/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java index d604ca5f6..6188fea6c 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java +++ b/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java @@ -677,7 +677,8 @@ public List getEventsCourse(long crsCod) { public Cursor getEventsCourseCursor(long crsCod) { return db.rawQuery("SELECT * FROM " + DB_TABLE_EVENTS_ATTENDANCES + " AS E" + " INNER JOIN " + DB_TABLE_EVENTS_COURSES + " AS C" - + " ON E.id = C.eventCode WHERE C.crsCod ='" + crsCod + "'", null); + + " ON E.id = C.eventCode WHERE C.crsCod ='" + crsCod + "' AND hidden=" + Utils.parseBoolInt(false) + + " ORDER BY E.startTime DESC,E.endTime DESC,E.title DESC", null); } /** From d961e7e5931b97255d28927ffd6ca70dd66181d0 Mon Sep 17 00:00:00 2001 From: Amab Date: Thu, 27 Nov 2014 20:55:34 +0100 Subject: [PATCH 2/9] Added internal server error message --- app/src/main/java/es/ugr/swad/swadroid/modules/Module.java | 2 +- .../modules/notifications/NotificationsSyncAdapterService.java | 2 +- app/src/main/res/values-ca/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/Module.java b/app/src/main/java/es/ugr/swad/swadroid/modules/Module.java index 2e7747f77..220b5d34c 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/Module.java +++ b/app/src/main/java/es/ugr/swad/swadroid/modules/Module.java @@ -443,7 +443,7 @@ protected void onPostExecute(Void unused) { Log.e(TAG, "httpStatusCode=" + httpStatusCode); switch(httpStatusCode) { - case 500: errorMsg = getString(R.string.errorServerResponseMsg); + case 500: errorMsg = getString(R.string.errorInternalServerMsg); break; case 503: errorMsg = getString(R.string.errorServiceUnavailableMsg); diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java b/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java index b7995920b..a10ac9e4a 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java +++ b/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java @@ -149,7 +149,7 @@ public void onPerformSync(Account account, Bundle extras, String authority, Cont Log.e(TAG, "httpStatusCode=" + httpStatusCode); switch(httpStatusCode) { - case 500: errorMessage = mContext.getString(R.string.errorServerResponseMsg); + case 500: errorMessage = mContext.getString(R.string.errorInternalServerMsg); break; case 503: errorMessage = mContext.getString(R.string.errorServiceUnavailableMsg); diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 470a94304..d707ab14e 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -90,6 +90,7 @@ El professor no permet veure els resultats del test Usuari o contrasenya incorrectes Error en resposta del servidor + Error intern del servidor Clau d\'aplicació incorrecta. Si us plau, contacti amb el desenvolupador. Error durant la connexió amb el servidor Temps d\'espera esgotat intentant connectar amb el servidor diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 76baa6dd2..3f5dd1e40 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -93,6 +93,7 @@ El profesor no permite ver los resultados del test Usuario o contraseña incorrectos Error en respuesta del servidor + Error interno del servidor Clave de aplicación incorrecta. Por favor, contacte con el desarrollador. Error durante la conexión con el servidor Tiempo de espera agotado intentando conectar con el diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa8044c22..0cb17616d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,6 +92,7 @@ The teacher does not allow to see the results Username or password incorrect Error in server response + Internal server error Unknown application key. Please contact the developer Error while connecting to server Timeout trying to connect to the server From 4c81048d306b624ebb96a4534dfa62844e0ce02e Mon Sep 17 00:00:00 2001 From: Amab Date: Thu, 27 Nov 2014 21:33:13 +0100 Subject: [PATCH 3/9] Changed scan delay of QR to 2s --- .../java/com/google/zxing/client/android/CaptureActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/google/zxing/client/android/CaptureActivity.java b/app/src/main/java/com/google/zxing/client/android/CaptureActivity.java index 43a0549aa..6f77e88d9 100644 --- a/app/src/main/java/com/google/zxing/client/android/CaptureActivity.java +++ b/app/src/main/java/com/google/zxing/client/android/CaptureActivity.java @@ -74,7 +74,7 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback private static final String TAG = CaptureActivity.class.getSimpleName(); - private static final long BULK_MODE_SCAN_DELAY_MS = 3000L; + private static final long BULK_MODE_SCAN_DELAY_MS = 2000L; private static final int[] sounds = {R.raw.beep, R.raw.klaxon}; From 2903799fa8e376d51659f97f91857b1c7003ceae Mon Sep 17 00:00:00 2001 From: Amab Date: Thu, 27 Nov 2014 21:37:18 +0100 Subject: [PATCH 4/9] Fixed default translation message --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0cb17616d..5db76a096 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,7 +92,7 @@ The teacher does not allow to see the results Username or password incorrect Error in server response - Internal server error + Internal server error Unknown application key. Please contact the developer Error while connecting to server Timeout trying to connect to the server From 477d098c201fe6c7e610516b96040e31ef0884e4 Mon Sep 17 00:00:00 2001 From: Amab Date: Fri, 28 Nov 2014 00:14:56 +0100 Subject: [PATCH 5/9] Fixed screen refresh when sending list of attendances --- .../es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java b/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java index 97a9252ec..7c01d9302 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java +++ b/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java @@ -160,6 +160,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent) case Constants.ROLLCALL_USERS_DOWNLOAD_REQUEST_CODE: refreshAdapter(); break; + case Constants.ROLLCALL_USERS_SEND_REQUEST_CODE: + refreshAdapter(); + break; case Constants.SCAN_QR_REQUEST_CODE: refreshAdapter(); break; @@ -307,7 +310,7 @@ public boolean onOptionsItemSelected(MenuItem item) { 1); activity.putExtra("usersCodes", usersCodes); - startActivity(activity); + startActivityForResult(activity, Constants.ROLLCALL_USERS_SEND_REQUEST_CODE); return true; From 85599a3fd8f12af13f58c0c965ddd6e7a4abef72 Mon Sep 17 00:00:00 2001 From: Amab Date: Sun, 30 Nov 2014 14:15:46 +0100 Subject: [PATCH 6/9] Fixed typo --- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index d707ab14e..1c1dc4f6f 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -148,7 +148,7 @@ Tipus Temps Metadata - Poseu un codi de barres a l\'interior del rectangle del visor per escanejar." + Poseu un codi QR a l\'interior del rectangle del visor per escanejar." Ho sentim, la càmera d\'Android ha trobat un problema. Potser haureu reiniciar el dispositiu. OK diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3f5dd1e40..9f56968e2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -153,7 +153,7 @@ Tipo Tiempo Metadata - Coloque un código de barras en el interior del rectángulo del visor para + Coloque un código QR en el interior del rectángulo del visor para escanear. Lo sentimos, la cámara de Android ha encontrado un problema. Es posible que necesite reiniciar el dispositivo. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5db76a096..14bbb473d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -160,7 +160,7 @@ Type Time Metadata - Place a barcode inside the viewfinder rectangle to scan it. + Place a QR code inside the viewfinder rectangle to scan it. Sorry, the Android camera encountered a problem. You may need to restart the device. OK From d4d0429bb96c1ada2a8645f8d20b587261f7228d Mon Sep 17 00:00:00 2001 From: Amab Date: Sun, 30 Nov 2014 14:38:48 +0100 Subject: [PATCH 7/9] Added support for scanning barcodes --- .../es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java | 4 ++-- app/src/main/res/values-ca/strings.xml | 4 ++-- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java b/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java index 7c01d9302..6e591a8eb 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java +++ b/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java @@ -288,8 +288,8 @@ public boolean onOptionsItemSelected(MenuItem item) { // Check if device has a rear camera if (hasRearCam) { Intent activity = new Intent(Intents.Scan.ACTION); - activity.putExtra("SCAN_MODE", "QR_CODE_MODE"); - activity.putExtra("SCAN_FORMATS", "QR_CODE"); + activity.putExtra("SCAN_MODE", "QR_CODE_MODE,ONE_D_MODE"); + activity.putExtra("SCAN_FORMATS", "QR_CODE,ONE_D_FORMATS"); startActivityForResult(activity, Constants.SCAN_QR_REQUEST_CODE); } else { //If the device has no rear camera available show error message diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 1c1dc4f6f..24d3bcc03 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -148,7 +148,7 @@ Tipus Temps Metadata - Poseu un codi QR a l\'interior del rectangle del visor per escanejar." + Poseu un codi QR o codi de barres dins del rectangle visor per escanejar Ho sentim, la càmera d\'Android ha trobat un problema. Potser haureu reiniciar el dispositiu. OK @@ -156,7 +156,7 @@ Alumne d\'una altra assignatura Nom DNI - Codi QR no vàlid + Codi no vàlid No hi ha dades d\'aquest alumne No s\'ha detectat cap codi QR vàlid No hi ha noves notificacions diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9f56968e2..1b0da3c39 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -153,7 +153,7 @@ Tipo Tiempo Metadata - Coloque un código QR en el interior del rectángulo del visor para + Coloque un código QR o un código de barras en el interior del rectángulo del visor para escanear. Lo sentimos, la cámara de Android ha encontrado un problema. Es posible que necesite reiniciar el dispositivo. @@ -162,7 +162,7 @@ Alumno de otra asignatura Nombre DNI - Código QR no válido + Código no válido No existen datos de este alumno No se ha detectado ningún código QR válido No hay nuevas notificaciones diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14bbb473d..d4e421cb4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -160,7 +160,7 @@ Type Time Metadata - Place a QR code inside the viewfinder rectangle to scan it. + Place a QR code or barcode inside the viewfinder rectangle to scan it. Sorry, the Android camera encountered a problem. You may need to restart the device. OK @@ -168,7 +168,7 @@ Student of another course Name ID - QR code invalid + Invalid code No data on this student Not detect any valid QR code There are no new notifications From 88f3e1ceb9b420bca9f37584d8e0f3f39b31d25d Mon Sep 17 00:00:00 2001 From: Amab Date: Sun, 30 Nov 2014 21:18:07 +0100 Subject: [PATCH 8/9] Changed startTime and endTime of events to long --- .../swadroid/database/DataBaseHelper.java | 4 ++-- .../es/ugr/swad/swadroid/model/Event.java | 24 +++++++++---------- .../modules/rollcall/EventsCursorAdapter.java | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java b/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java index 6188fea6c..414231d4a 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java +++ b/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java @@ -404,8 +404,8 @@ private T createObjectByTable(String table, Entity ent) { crypto.decrypt(ent.getString("userSurname2")), crypto.decrypt(ent.getString("userFirstName")), crypto.decrypt(ent.getString("userPhoto")), - ent.getInt("startTime"), - ent.getInt("endTime"), + ent.getLong("startTime"), + ent.getLong("endTime"), Utils.parseIntBool(ent.getInt("commentsTeachersVisible")), crypto.decrypt(ent.getString("title")), crypto.decrypt(ent.getString("text")), diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Event.java b/app/src/main/java/es/ugr/swad/swadroid/model/Event.java index abffe632f..347a55244 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/model/Event.java +++ b/app/src/main/java/es/ugr/swad/swadroid/model/Event.java @@ -41,8 +41,8 @@ public class Event extends Model { private String userSurname2; private String userFirstName; private String userPhoto; - private int startTime; - private int endTime; + private long startTime; + private long endTime; private boolean commentsTeachersVisible; private String title; private String text; @@ -80,7 +80,7 @@ public class Event extends Model { * Constructor with status */ public Event(long attendanceEventCode, boolean hidden, String userSurname1, String userSurname2, - String userFirstName, String userPhoto, int startTime, int endTime, + String userFirstName, String userPhoto, long startTime, long endTime, boolean commentsTeachersVisible, String title, String text, String groups, String status) { super(attendanceEventCode); @@ -102,7 +102,7 @@ public Event(long attendanceEventCode, boolean hidden, String userSurname1, Stri * Constructor without status */ public Event(long attendanceEventCode, boolean hidden, String userSurname1, String userSurname2, - String userFirstName, String userPhoto, int startTime, int endTime, + String userFirstName, String userPhoto, long startTime, long endTime, boolean commentsTeachersVisible, String title, String text, String groups) { super(attendanceEventCode); this.hidden = hidden; @@ -159,7 +159,7 @@ public void setUserPhoto(String userPhoto) { this.userPhoto = userPhoto; } - public int getStartTime() { + public long getStartTime() { return startTime; } @@ -169,11 +169,11 @@ public Calendar getStartTimeCalendar() { return calendar; } - public void setStartTime(int startTime) { + public void setStartTime(long startTime) { this.startTime = startTime; } - public int getEndTime() { + public long getEndTime() { return endTime; } @@ -183,7 +183,7 @@ public Calendar getEndTimeCalendar() { return calendar; } - public void setEndTime(int endTime) { + public void setEndTime(long endTime) { this.endTime = endTime; } @@ -322,11 +322,11 @@ public void getPropertyInfo(int param, @SuppressWarnings("rawtypes") Hashtable a propertyInfo.name = "userPhoto"; break; case 6: - propertyInfo.type = PropertyInfo.INTEGER_CLASS; + propertyInfo.type = PropertyInfo.LONG_CLASS; propertyInfo.name = "startTime"; break; case 7: - propertyInfo.type = PropertyInfo.INTEGER_CLASS; + propertyInfo.type = PropertyInfo.LONG_CLASS; propertyInfo.name = "endTime"; break; case 8: @@ -376,10 +376,10 @@ public void setProperty(int param, Object obj) { userPhoto = (String) obj; break; case 6: - startTime = (Integer) obj; + startTime = (Long) obj; break; case 7: - endTime = (Integer) obj; + endTime = (Long) obj; break; case 8: commentsTeachersVisible = (Boolean) obj; diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java b/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java index 9d21e54f4..613edb8c2 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java +++ b/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java @@ -91,8 +91,8 @@ public EventsCursorAdapter(Context context, Cursor c, @Override public void bindView(View view, final Context context, Cursor cursor) { String title = crypto.decrypt(cursor.getString(cursor.getColumnIndex("title"))); - long startTime = cursor.getInt(cursor.getColumnIndex("startTime")); - long endTime = cursor.getInt(cursor.getColumnIndex("endTime")); + long startTime = cursor.getLong(cursor.getColumnIndex("startTime")); + long endTime = cursor.getLong(cursor.getColumnIndex("endTime")); final boolean pending = crypto.decrypt(cursor.getString(cursor.getColumnIndex("status"))).equals("pending"); Calendar today = Calendar.getInstance(); Calendar startTimeCalendar = Calendar.getInstance(); From 588e8da334be76337df47bc38ec8df91a9d1e887 Mon Sep 17 00:00:00 2001 From: Amab Date: Sun, 30 Nov 2014 21:30:44 +0100 Subject: [PATCH 9/9] Bumped version --- app/src/main/AndroidManifest.xml | 4 ++-- app/src/main/res/raw-es/changes.html | 10 ++++++++++ app/src/main/res/raw/changes.html | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f1fe92173..01a3a76c2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="68" + android:versionName="1.2.3" > diff --git a/app/src/main/res/raw-es/changes.html b/app/src/main/res/raw-es/changes.html index c88b6855f..150f6fd07 100644 --- a/app/src/main/res/raw-es/changes.html +++ b/app/src/main/res/raw-es/changes.html @@ -15,6 +15,16 @@ +

1.2.3 (2014-11-30)

+
    + [NOVEDADES] +
  • Añadido soporte para escaneo de códigos de barras en el control de asistencia
    • +
+
    + [ACTUALIZACIONES] +
  • Ahora el listado de eventos se muestra ordenado en el control de asistencia
    • +
  • Reducido retardo entre escaneos de códigos a 2 segundos
    • +

1.2.2 (2014-11-26)

    [ACTUALIZACIONES] diff --git a/app/src/main/res/raw/changes.html b/app/src/main/res/raw/changes.html index 9366d323c..81edbfc77 100644 --- a/app/src/main/res/raw/changes.html +++ b/app/src/main/res/raw/changes.html @@ -15,6 +15,16 @@ +

    1.2.3 (2014-11-30)

    +
      + [NEW] +
    • Added support for barcode scanning in rollcall module
      • +
    +
      + [UPDATES] +
    • Now the events list is sorted in rollcall module
      • +
    • Changed scan delay of codes to 2 seconds
      • +

    1.2.2 (2014-11-26)

      [UPDATES]