Merge branch 'release/1.2.3'

Amab · Nov 30, 2014 · 87b23d1 · 87b23d1
2 parents 6d98acc + 588e8da
commit 87b23d1
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 31 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="es.ugr.swad.swadroid"
     android:installLocation="auto"
-    android:versionCode="67"
-    android:versionName="1.2.2" >
+    android:versionCode="68"
+    android:versionName="1.2.3" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

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
@@ -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};
 

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
@@ -404,8 +404,8 @@ private <T extends Model> 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")),
@@ -677,7 +677,8 @@ public List<Event> 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);
     }
 
     /**

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
@@ -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/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/...main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java b/...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/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();

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
@@ -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;
@@ -285,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
@@ -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;
 

diff --git a/app/src/main/res/raw-es/changes.html b/app/src/main/res/raw-es/changes.html
@@ -15,6 +15,16 @@
 </head>
 
 <body bgcolor="white">
+<h4>1.2.3 (2014-11-30)</h4>
+<ul>
+    <lh class="new">[NOVEDADES]</lh>
+    <li type="disc">A&ntilde;adido soporte para escaneo de c&oacute;digos de barras en el control de asistencia</li>
+</ul>
+<ul>
+    <lh class="update">[ACTUALIZACIONES]</lh>
+    <li type="disc">Ahora el listado de eventos se muestra ordenado en el control de asistencia</li>
+    <li type="disc">Reducido retardo entre escaneos de c&oacute;digos a 2 segundos</li>
+</ul>
 <h4>1.2.2 (2014-11-26)</h4>
 <ul>
   <lh class="update">[ACTUALIZACIONES]</lh>

diff --git a/app/src/main/res/raw/changes.html b/app/src/main/res/raw/changes.html
@@ -15,6 +15,16 @@
 </head>
 
 <body bgcolor="white">
+<h4>1.2.3 (2014-11-30)</h4>
+<ul>
+    <lh class="new">[NEW]</lh>
+    <li type="disc">Added support for barcode scanning in rollcall module</li>
+</ul>
+<ul>
+    <lh class="update">[UPDATES]</lh>
+    <li type="disc">Now the events list is sorted in rollcall module</li>
+    <li type="disc">Changed scan delay of codes to 2 seconds</li>
+</ul>
 <h4>1.2.2 (2014-11-26)</h4>
 <ul>
   <lh class="update">[UPDATES]</lh>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -90,6 +90,7 @@
     <string name="testNoResultsMsg">El professor no permet veure els resultats del test</string>
     <string name="errorBadLoginMsg">Usuari o contrasenya incorrectes</string>
     <string name="errorServerResponseMsg">Error en resposta del servidor</string>
+    <string name="errorInternalServerMsg">Error intern del servidor</string>
     <string name="errorBadAppKeyMsg">Clau d\'aplicació incorrecta. Si us plau, contacti amb el desenvolupador.</string>
     <string name="errorConnectionMsg">Error durant la connexió amb el servidor</string>
     <string name="errorTimeoutMsg">Temps d\'espera esgotat intentant connectar amb el servidor</string>
@@ -147,15 +148,15 @@
     <string name="msg_default_type">Tipus</string>
     <string name="msg_default_time">Temps</string>
     <string name="msg_default_meta">Metadata</string>
-    <string name="msg_default_status">Poseu un codi de barres a l\'interior del rectangle del visor per escanejar."</string>
+    <string name="msg_default_status">Poseu un codi QR o codi de barres dins del rectangle visor per escanejar</string>
     <string name="msg_camera_framework_bug">Ho sentim, la càmera d\'Android ha trobat un problema. Potser haureu
         reiniciar el dispositiu.</string>
     <string name="button_ok">OK</string>
     <string name="scan_valid_student">Alumne d\'aquesta assignatura</string>
     <string name="scan_not_valid_student">Alumne d\'una altra assignatura</string>
     <string name="scan_name">Nom</string>
     <string name="scan_id">DNI</string>
-    <string name="scan_not_valid_code">Codi QR no vàlid</string>
+    <string name="scan_not_valid_code">Codi no vàlid</string>
     <string name="scan_data_not_found">No hi ha dades d\'aquest alumne</string>
     <string name="scan_no_codes">No s\'ha detectat cap codi QR vàlid</string>
     <string name="NoNotificationsMsg">No hi ha noves notificacions</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -93,6 +93,7 @@
     <string name="testNoResultsMsg">El profesor no permite ver los resultados del test</string>
     <string name="errorBadLoginMsg">Usuario o contraseña incorrectos</string>
     <string name="errorServerResponseMsg">Error en respuesta del servidor</string>
+    <string name="errorInternalServerMsg">Error interno del servidor</string>
     <string name="errorBadAppKeyMsg">Clave de aplicación incorrecta. Por favor, contacte con el desarrollador.</string>
     <string name="errorConnectionMsg">Error durante la conexión con el servidor</string>
     <string name="errorTimeoutMsg">Tiempo de espera agotado intentando conectar con el
@@ -152,7 +153,7 @@
     <string name="msg_default_type">Tipo</string>
     <string name="msg_default_time">Tiempo</string>
     <string name="msg_default_meta">Metadata</string>
-    <string name="msg_default_status">Coloque un código de barras en el interior del rectángulo del visor para
+    <string name="msg_default_status">Coloque un código QR o un código de barras en el interior del rectángulo del visor para
         escanear.</string>
     <string name="msg_camera_framework_bug">Lo sentimos, la cámara de Android ha encontrado un problema. Es posible que
         necesite reiniciar el dispositivo.</string>
@@ -161,7 +162,7 @@
     <string name="scan_not_valid_student">Alumno de otra asignatura</string>
     <string name="scan_name">Nombre</string>
     <string name="scan_id">DNI</string>
-    <string name="scan_not_valid_code">Código QR no válido</string>
+    <string name="scan_not_valid_code">Código no válido</string>
     <string name="scan_data_not_found">No existen datos de este alumno</string>
     <string name="scan_no_codes">No se ha detectado ningún código QR válido</string>
     <string name="NoNotificationsMsg">No hay nuevas notificaciones</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -92,6 +92,7 @@
     <string name="testNoResultsMsg">The teacher does not allow to see the results</string>
     <string name="errorBadLoginMsg">Username or password incorrect</string>
     <string name="errorServerResponseMsg">Error in server response</string>
+    <string name="errorInternalServerMsg">Internal server error</string>
     <string name="errorBadAppKeyMsg">Unknown application key. Please contact the developer</string>
     <string name="errorConnectionMsg">Error while connecting to server</string>
     <string name="errorTimeoutMsg">Timeout trying to connect to the server</string>
@@ -159,15 +160,15 @@
     <string name="msg_default_type">Type</string>
     <string name="msg_default_time">Time</string>
     <string name="msg_default_meta">Metadata</string>
-    <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
+    <string name="msg_default_status">Place a QR code or barcode inside the viewfinder rectangle to scan it.</string>
     <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the
         device.</string>
     <string name="button_ok">OK</string>
     <string name="scan_valid_student">Student of this course</string>
     <string name="scan_not_valid_student">Student of another course</string>
     <string name="scan_name">Name</string>
     <string name="scan_id">ID</string>
-    <string name="scan_not_valid_code">QR code invalid</string>
+    <string name="scan_not_valid_code">Invalid code</string>
     <string name="scan_data_not_found">No data on this student</string>
     <string name="scan_no_codes">Not detect any valid QR code</string>
     <string name="NoNotificationsMsg">There are no new notifications</string>