Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Added disabling group selection when closed.

Browse Source 
Added missing images and strings
This commit is contained in:
Helena Rodriguez 2012-11-04 14:17:54 +01:00
parent b75c69747b
commit 126fc24a8c
12 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SWADroid/res/drawable-hdpi/enrollment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
SWADroid/res/drawable-ldpi/enrollment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
SWADroid/res/drawable-mdpi/enrollment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

2
SWADroid/res/layout/group_list_item.xml
View File

@ -21,7 +21,6 @@
android:layout_height="wrap_content"
android:layout_toRightOf="@id/padlockIcon"
android:textColor="@android:color/black"
android:text="Prueba"
android:focusable="false"
android:clickable="false"
android:visibility="gone"/>
@ -30,7 +29,6 @@
android:layout_height="wrap_content"
android:layout_toRightOf="@id/padlockIcon"
android:textColor="@android:color/black"
android:text="Prueba"
android:focusable="false"
android:clickable="false"
/>

22
SWADroid/res/values-ca/strings.xml
View File

@ -33,23 +33,23 @@
<string name="organization_preferences">Universidad de Granada</string>
<string name="loginTitle_menu">Connectar</string>
<string name="loginProgressTitle">Identificació</string>
<string name="loginProgressDescription">Connectant...</string>
<string name="loginProgressDescription">Connectant&#8230;</string>
<string name="coursesProgressTitle">Assignatures</string>
<string name="coursesProgressDescription">Obtenint assignatures...</string>
<string name="coursesProgressDescription">Obtenint assignatures&#8230;</string>
<string name="notificationsProgressTitle">Notificacions</string>
<string name="notificationsProgressDescription">Obtenint noves notificacions...</string>
<string name="notificationsProgressDescription">Obtenint noves notificacions&#8230;</string>
<string name="notificationsEmptyListMsg">No s\'ha descarregat cap notificació.\n\nPer a descarregar les
notificacions més recents premi l\'icona al cantó superior dreta de la pantalla.</string>
<string name="notificationsDownloadedMsg">Notificacions descarregades</string>
<string name="testsDownloadProgressTitle">Tests</string>
<string name="testsDownloadProgressDescription">Sincronitzant preguntes de test.\n\En funció del nombre de
preguntes a sincronitzar, el processament de les dades pot tardar uns minuts.\n\nSi us plau, esperi...</string>
preguntes a sincronitzar, el processament de les dades pot tardar uns minuts.\n\nSi us plau, esperi&#8230;</string>
<string name="errorMsgWorkaroundEmulator">Merda. Aquest bug del emulador d\'Android ha tornat a
aparèixer. Provant una altra vegada...</string>
aparèixer. Provant una altra vegada&#8230;</string>
<string name="errorMsgLaunchingActivity">Ha ocorregut un error durant l\'execució de l\'operació</string>
<string name="errorMsgNoConnection">No n\'hi ha conexió</string>
<string name="errorCopyMsg_DB">Error copiant la base de dades</string>
<string name="upgradeMsg_DB">Actualitzant la base de dades...</string>
<string name="upgradeMsg_DB">Actualitzant la base de dades&#8230;</string>
<string name="loginSuccessfulMsg">Connectat</string>
<string name="examAnnouncement">Convocatòria d\'examen</string>
<string name="marksFile">Qualificacions</string>
@ -99,7 +99,7 @@
<string name="errorServerResponseMsg">Error en la resposta del servidor</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>
<string name="sendingMessageMsg">Enviant missatge...</string>
<string name="sendingMessageMsg">Enviant missatge&#8230;</string>
<string name="messageSendedMsg">Missatge enviat</string>
<string name="messageSendErrorMsg">Error al enviar el missatge. Comprovi les dades introduïts</string>
<string name="message_receivers_title">Detinataris (separarts per comas)</string>
@ -123,6 +123,10 @@
<string name="confirmEnrollments">Confirmar inscripcions sollicitades</string>
<string name="areYouSure"> Esteu segur que vol inscriure en els grups seleccionats?</string>
<string name="failedEnrollment">Ho sentim però la inscripció en els grups seleccionats no es va poder realitzar</string>
<string name="groupsProgressDescription">Obtenint groupos...</string>
<string name="groupTypesProgressDescription">Obtenint Tipus de grup...</string>
<string name="groupsProgressDescription">Obtenint groupos&#8230;\nSi us plau&#8230;</string>
<string name="groupTypesProgressDescription">Obtenint Tipus de grup&#8230;\nSi us plau&#8230;</string>
<string name="groupTypesProgressTitle">Tipus de grup</string>
<string name="groupsProgressTitle">Groupos</string>
<string name="sendMyGroupsProgressDescription">Enviant Inscripció a grups&#8230;\nSi us plau&#8230;</string>
<string name="sendMyGroupsProgressTitle">Inscripció en grups</string>
</resources>

26
SWADroid/res/values-de/strings.xml
View File

@ -38,20 +38,20 @@
<string name="organization_preferences">Universität Granada</string>
<string name="loginTitle_menu">anmelden</string>
<string name="loginProgressTitle">anmelden</string>
<string name="loginProgressDescription">Anschluss...</string>
<string name="loginProgressDescription">Anschluss&#8230;</string>
<string name="coursesProgressTitle">Kurse</string>
<string name="coursesProgressDescription">Abrufen von Kursen...</string>
<string name="coursesProgressDescription">Abrufen von Kursen&#8230;</string>
<string name="notificationsProgressTitle">Benachrichtigungen</string>
<string name="notificationsProgressDescription">Abrufen neuer Benachrichtigungen...</string>
<string name="notificationsProgressDescription">Abrufen neuer Benachrichtigungen&#8230;</string>
<string name="notificationsEmptyListMsg">Nicht heruntergeladen haben keine Benachrichtigung.\n\nZum Download j<>ngsten Benachrichtigungen klicken Sie auf das Symbol in der oberen rechten Ecke des Bildschirms.</string>
<string name="notificationsDownloadedMsg">Benachrichtigungen heruntergeladen</string>
<string name="testsDownloadProgressTitle">Tests</string>
<string name="testsDownloadProgressDescription">Synchronisieren von Testfragen.\n\nAbhängig von der Anzahl der Fragen zu synchronisieren, kann die Datenverarbeitung mehrere Minuten dauern.\n\nBitte warten...</string>
<string name="testsDownloadProgressDescription">Synchronisieren von Testfragen.\n\nAbhängig von der Anzahl der Fragen zu synchronisieren, kann die Datenverarbeitung mehrere Minuten dauern.\n\nBitte warten&#8230;</string>
<string name="errorMsgLaunchingActivity">Ein Fehler ist aufgetreten während der Ausführung der Operation</string>
<string name="errorMsgWorkaroundEmulator">Das Android-Emulator Fehler wieder erschien. Neuer Versuch...</string>
<string name="errorMsgWorkaroundEmulator">Das Android-Emulator Fehler wieder erschien. Neuer Versuch&#8230;</string>
<string name="errorMsgNoConnection">Keine Verbindung gefunden</string>
<string name="errorCopyMsg_DB">Fehler beim Kopieren der Datenbank</string>
<string name="upgradeMsg_DB">Upgrade von Datenbank...</string>
<string name="upgradeMsg_DB">Upgrade von Datenbank&#8230;</string>
<string name="loginSuccessfulMsg">Melden Sie sich an erfolgreich</string>
<string name="examAnnouncement">Prüfung Ankündigung</string>
<string name="marksFile">Bewertungen</string>
@ -102,14 +102,14 @@
<string name="errorServerResponseMsg">Fehler in der Server-Antwort</string>
<string name="errorConnectionMsg">Fehler bei der Verbindung zum Server</string>
<string name="errorTimeoutMsg">Zeitlimit versucht, die Verbindung zum Server</string>
<string name="sendingMessageMsg">Nachricht wird gesendet...</string>
<string name="sendingMessageMsg">Nachricht wird gesendet&#8230;</string>
<string name="messageSendedMsg">Nachricht gesendet erfolgreich</string>
<string name="messageSendErrorMsg">Fehler beim Senden der Nachricht. überprüfen Sie die Daten in der Nachricht Felder</string>
<string name="message_receivers_title">Empfänger (getrennt durch Komma)</string>
<string name="message_subject_title">Betreff</string>
<string name="message_body_title">Nachricht</string>
<string name="notice_body_title">Ankündigungen</string>
<string name="publishingNotice">Veröffentlichung Ankündigung...</string>
<string name="publishingNotice">Veröffentlichung Ankündigung&#8230;</string>
<string name="noticePublished">Veröffentlichung der Ankündigung</string>
<string name="noticeSendError">Fehler bei der Veröffentlichung der neuen Ankündigung</string>
<string name="sendMsg">senden</string>
@ -135,7 +135,7 @@
<string name="marksMsg">Klicken Sie auf die Benachrichtigung, um die Marke anzeigen.</string>
<string name="clickToGetCourses">Klicken Sie hier, um Ihre Kurse zu bekommen</string>
<string name="documentsDownloadModuleLabel">Dokumente</string>
<string name="documentsDownloadProgressDescription">Erste-Dateien...</string>
<string name="documentsDownloadProgressDescription">Erste-Dateien&#8230;</string>
<string name="sharedsDownloadModuleLabel">Gemeinsamer Bereich</string>
<string name="connectionRequired">Internetverbindung ist für diese Funktionalität erforderlich</string>
<string name="home_icon">Zeigt home Ordner</string>
@ -149,7 +149,7 @@
<string name="myGroupsModuleLabel">Meine Gruppen</string>
<string name="groupSeparator">: </string>
<string name="groupTypesModuleLabel">Schaffen Gruppetypen</string>
<string name="sendMyGroupsProgressDescription">Schicken gerade Einschreibung in Gruppen</string>
<string name="sendMyGroupsProgressDescription">Schicken gerade Einschreibung in Gruppen&#8230;\nBitte warten&#8230;</string>
<string name="sendMyGroupsProgressTitle">Einschreibung in Gruppen</string>
<string name="openingTime">Öffnungsdatum: </string>
<string name="noGroupsText">Gruppen worden nicht im Kurs erstellt</string>
@ -159,6 +159,8 @@
<string name="confirmEnrollments">Bestätigen angeforderten Einschreibungen</string>
<string name="areYouSure">Sind Sie sicher, dass Sie sich auf den ausgewählten Gruppen einschreiben wollen?</string>
<string name="failedEnrollment">Sorry, aber die Eintragung in den ausgewählten Gruppen konnte nicht durchgeführt werden</string>
<string name="groupsProgressDescription">Abrufen von Gruppen...</string>
<string name="groupTypesProgressDescription">Abrufen Gruppentypen...</string>
<string name="groupsProgressDescription">Abrufen Gruppen&#8230;\nBitte warten&#8230;</string>
<string name="groupTypesProgressDescription">Abrufen Gruppentypen&#8230;\nBitte warten&#8230;</string>
<string name="groupTypesProgressTitle">Gruppenarten</string>
<string name="groupsProgressTitle">Guppen</string>
</resources>

31
SWADroid/res/values-es/strings.xml
View File

@ -37,24 +37,24 @@
<string name="organization_preferences">Universidad de Granada</string>
<string name="loginTitle_menu">Conectar</string>
<string name="loginProgressTitle">Identificación</string>
<string name="loginProgressDescription">Conectando...</string>
<string name="loginProgressDescription">Conectando&#8230;</string>
<string name="coursesProgressTitle">Asignaturas</string>
<string name="coursesProgressDescription">Obteniendo asignaturas...</string>
<string name="coursesProgressDescription">Obteniendo asignaturas&#8230;</string>
<string name="notificationsProgressTitle">Notificaciones</string>
<string name="notificationsProgressDescription">Obteniendo nuevas notificaciones...</string>
<string name="notificationsProgressDescription">Obteniendo nuevas notificaciones&#8230;</string>
<string name="notificationsEmptyListMsg">No se ha descargado ninguna notificación.\n\nPara descargar las
notificaciones más recientes pulse el icono de la esquina superior derecha de la pantalla.</string>
<string name="notificationsDownloadedMsg">Notificaciones descargadas</string>
<string name="testsDownloadProgressTitle">Tests</string>
<string name="testsDownloadProgressDescription">Sincronizando preguntas de test.\n\nDependiendo del número de
preguntas a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere...</string>
preguntas a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere&#8230;</string>
<string name="errorMsgLaunchingActivity">Ha ocurrido un error durante la ejecución de la
operación</string>
<string name="errorMsgWorkaroundEmulator">Mierda. Ese bug del emulador de Android ha vuelto a
aparecer. Reintentando...</string>
aparecer. Reintentando&#8230;</string>
<string name="errorMsgNoConnection">No hay conexión</string>
<string name="errorCopyMsg_DB">Error copiando base de datos</string>
<string name="upgradeMsg_DB">Actualizando base de datos...</string>
<string name="upgradeMsg_DB">Actualizando base de datos&#8230;</string>
<string name="loginSuccessfulMsg">Conectado</string>
<string name="examAnnouncement">Convocatoria de examen</string>
<string name="marksFile">Calificaciones</string>
@ -115,14 +115,14 @@
<string name="errorConnectionMsg">Error durante la conexión con el servidor</string>
<string name="errorTimeoutMsg">Tiempo de espera agotado intentando conectar con el
servidor</string>
<string name="sendingMessageMsg">Enviando mensaje...</string>
<string name="sendingMessageMsg">Enviando mensaje&#8230;</string>
<string name="messageSendedMsg">Mensaje enviado</string>
<string name="messageSendErrorMsg">Error al enviar el mensaje. Compruebe los datos introducidos</string>
<string name="message_receivers_title">Destinatarios (separados por comas)</string>
<string name="message_subject_title">Asunto</string>
<string name="message_body_title">Mensaje</string>
<string name="notice_body_title">Aviso</string>
<string name="publishingNotice">Publicando aviso...</string>
<string name="publishingNotice">Publicando aviso&#8230;</string>
<string name="noticePublished">Aviso publicado</string>
<string name="noticeSendError">Error al publicar el nuevo aviso</string>
<string name="sendMsg">Enviar</string>
@ -145,7 +145,7 @@
<string name="users">Usuarios</string>
<string name="usersDownloadProgressTitle">Estudiantes</string>
<string name="usersDownloadProgressDescription">Sincronizando estudiantes.\n\nDependiendo del número de
estudiantes a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere...</string>
estudiantes a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere&#8230;</string>
<string name="documentsDownloadModuleLabel">Documentos</string>
<string name="documentsDownloadProgressDescription">Obteniendo árbol de archivos..</string>
<string name="sharedsDownloadModuleLabel">Zona común</string>
@ -192,8 +192,6 @@ Intente "Actualizar alumnos"</string>
<string name="noCameraFound">El dispositivo no dispone de cámara</string>
<string name="saveMsg">Guardar</string>
<string name="addSessionTitle_menu">Nueva sesión de prácticas</string>
<string name="groupsProgressDescription">Obteniendo grupos...</string>
<string name="groupsProgressTitle">Grupos</string>
<string name="noGroupsAvailableMsg">No existen grupos para la asignatura seleccionada</string>
<string name="groupsUpdated">Grupos actualizados</string>
<string name="sessionCourseText">Asignatura</string>
@ -224,7 +222,7 @@ Intente "Actualizar alumnos"</string>
<string name="rollcallModuleLabel">Pasar lista</string>
<string name="studentsTitle">Estudiantes</string>
<string name="studentsDownloadProgressDescription">Sincronizando estudiantes.\n\nDependiendo del número de
estudiantes a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere...</string>
estudiantes a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere&#8230;</string>
<string name="studentsList">Lista de estudiantes</string>
<string name="studentsDownloadProgressTitle">Estudiantes</string>
<string name="studentsPresent">Estudiantes presentes</string>
@ -246,8 +244,6 @@ Seleccione: Sesiones de prácticas - Nueva</string>
<string name="froyoFunctionMsg">Esta función requiere Android 2.2 o superior</string>
<string name="groupSeparator">: </string>
<string name="groupTypesModuleLabel">Conseguir tipos de grupo</string>
<string name="sendMyGroupsProgressDescription">Enviando inscripción a grupos</string>
<string name="sendMyGroupsProgressTitle">Inscripción en grupos</string>
<string name="openingTime">Apertura: </string>
<string name="noGroupsText">No se han creado grupos dentro de la asignatura</string>
<string name="changeGroups">Cambiar de grupos</string>
@ -256,6 +252,11 @@ Seleccione: Sesiones de prácticas - Nueva</string>
<string name="confirmEnrollments">Confirmar inscripciones solicitadas </string>
<string name="areYouSure"> ¿Seguro que quiere inscribirse en los grupos seleccionados?</string>
<string name="failedEnrollment">Lo sentimos pero la inscripción en los grupos seleccionados no se pudo realizar</string>
<string name="groupTypesProgressDescription">Obteniendo tipos de grupo...</string>
<string name="groupTypesProgressDescription">Obteniendo tipos de grupo&#8230;\nPor favor, espere&#8230;</string>
<string name="groupsProgressDescription">Obteniendo grupos&#8230;\nPor favor, espere&#8230;</string>
<string name="groupTypesProgressTitle">Tipos de grupos</string>
<string name="groupsProgressTitle">Grupos</string>
<string name="sendMyGroupsProgressDescription">Enviando inscripción a grupos&#8230;\nPor favor, espere&#8230;</string>
<string name="sendMyGroupsProgressTitle">Inscripción a grupos</string>
</resources>

1
SWADroid/res/values/colors.xml
View File

@ -38,5 +38,6 @@
<color name="possible_result_points">#c0ffff00</color>
<color name="pale_yellow">#f2eca1</color>
<color name="dark_grey"> #383838</color>
<color name="sgilight_gray">#AAAAAA</color>
</resources>

8
SWADroid/res/values/strings.xml
View File

@ -196,7 +196,7 @@ Try "Update students"</string>
<string name="noCameraFound">The device has no camera</string>
<string name="saveMsg">Save</string>
<string name="addSessionTitle_menu">New practice session</string>
<string name="groupsProgressDescription">Retrieving groups...</string>
<string name="groupsProgressDescription">Retrieving groups...\n\nPlease wait...</string>
<string name="groupsProgressTitle">Groups</string>
<string name="noGroupsAvailableMsg">No groups for selected subject</string>
<string name="groupsUpdated">Groups updated</string>
@ -254,11 +254,11 @@ must have practice groups defined in SWAD.\n\nYou can delete this
configuration anytime using the "Clean Database" option\n\nDo you want to continue?</string>
<string name="noRollcallAllowedMsg">Rollcall for the selected subject is not allowed. Try "Clean database"</string>
<string name="froyoFunctionMsg">This function needs Android 2.2 or higher</string>
<string name="groupTypesProgressDescription">Retrieving group types...</string>
<string name="groupTypesProgressDescription">Retrieving group types&#8230;\nPlease wait&#8230;</string>
<string name="groupTypesProgressTitle">Group Types</string>
<string name="groupSeparator">: </string>
<string name="groupTypesModuleLabel">Get Group Types</string>
<string name="sendMyGroupsProgressDescription">Sending enrollment into groups</string>
<string name="groupTypesModuleLabel">Group Types</string>
<string name="sendMyGroupsProgressDescription">Sending enrollment into groups&#8230;\nPlease wait&#8230;</string>
<string name="sendMyGroupsProgressTitle">Enrolment into groups</string>
<string name="openingTime">Opening: </string>
<string name="noGroupsText">No groups have been created in the course</string>

2
SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
View File

@ -513,7 +513,7 @@ public class SWADMain extends MenuExpandableListActivity {
final HashMap<String, Object> enrolment = new HashMap<String,Object>();
enrolment.put(NAME, getString(R.string.enrollment));
//TODO enrolment.put(IMAGE, getResources().getDrawable(R.drawable.blackboard));
enrolment.put(IMAGE, getResources().getDrawable(R.drawable.enrollment));
headerData.add(enrolment);
final ArrayList<ArrayList<HashMap<String, Object>>> childData = new ArrayList<ArrayList<HashMap<String, Object>>>();

10
SWADroid/src/es/ugr/swad/swadroid/modules/GroupTypes.java
View File

@ -108,16 +108,6 @@ public class GroupTypes extends Module {
dbHelper.insertCollection(Global.DB_TABLE_GROUP_TYPES, groupsSWAD);
/* //TODO remove obsolete groups
for(int i = 0; i < groupsSWAD.size(); ++i){
GroupType g = (GroupType) groupsSWAD.get(i);
//boolean isAdded = dbHelper.insertGroup(g,Global.getSelectedCourseCode());
//if(!isAdded){
if(!dbHelper.insertGroupType(g)){
setResult(RESULT_CANCELED);
}
}*/
//Request finalized without errors
setResult(RESULT_OK);
}
}

30
SWADroid/src/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java
View File

@ -109,22 +109,25 @@ public class EnrollmentExpandableListAdapter extends BaseExpandableListAdapter {
if(open != 0){
holder.imagePadlock.setImageResource(R.drawable.padlockgreen);
convertView.setEnabled(true);
/*holder.checkBox.setEnabled(true);
holder.checkBox.setEnabled(true);
holder.checkBox.setTextColor(context.getResources().getColor(android.R.color.black));
holder.imagePadlock.setEnabled(true);
holder.nStudentText.setEnabled(true);
holder.radioButton.setEnabled(true);
holder.radioButton.setTextColor(context.getResources().getColor(android.R.color.black));
holder.relativeLayout.setEnabled(true);
holder.vacantsText.setEnabled(true);*/
holder.vacantsText.setEnabled(true);
}else{
holder.imagePadlock.setImageResource(R.drawable.padlockred);
convertView.setEnabled(false);
/* holder.checkBox.setEnabled(false);
holder.checkBox.setEnabled(false);
holder.checkBox.setTextColor( context.getResources().getColor(R.color.sgilight_gray));
holder.imagePadlock.setEnabled(false);
holder.nStudentText.setEnabled(false);
holder.radioButton.setEnabled(false);
holder.radioButton.setTextColor(context.getResources().getColor(R.color.sgilight_gray));
holder.relativeLayout.setEnabled(false);
holder.vacantsText.setEnabled(false);*/
holder.vacantsText.setEnabled(false);
}
//for multiple inscriptions the groups should be checkboxes to allow multiple choice
//otherwise the groups should be radio button to allow just a single choice
@ -219,7 +222,14 @@ public class EnrollmentExpandableListAdapter extends BaseExpandableListAdapter {
@Override
public boolean isChildSelectable(int groupPosition, int childPosition) {
return true;
Long groupTypeCode = groups.get(groupPosition).getId();
ArrayList<Group> children = this.children.get(groupTypeCode);
Group group = children.get(childPosition);
if(group.getOpen() != 0)
return true;
else
return false;
}
/**
@ -285,17 +295,11 @@ public class EnrollmentExpandableListAdapter extends BaseExpandableListAdapter {
for(int i = 0; i < children.size(); ++i){
g = children.get(i);
if(g.getMember() == 1){
long code = g.getId();
groupCodes.add(Long.valueOf(g.getId()));
}
}
}
return groupCodes;
}
@Override
public boolean areAllItemsEnabled() {
return false;
}
}