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

Added empty layout for group enrollment when there is any group

Browse Source
This commit is contained in:
Helena Rodriguez 2012-10-19 10:12:32 +02:00
parent 3bfac55957
commit 30e9736bad
6 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SWADroid/res/layout/group_choice.xml
View File

@ -27,5 +27,17 @@
android:background="@color/background"
>
</ExpandableListView>
<TextView
android:id="@+id/noGroupsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:visibility="gone"
android:text="@string/noGroupsText"
android:textSize="24sp"
android:padding="20dip"
android:textColor="@color/foreground1"
android:gravity="center"/>
</LinearLayout>

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

@ -142,4 +142,5 @@ Es muss mindestens ein Antworttyp ausgewählt werden</string>
<string name="sendMyGroupsProgressDescription">Schicken gerade Einschreibung in Gruppen</string>
<string name="sendMyGroupsProgressTitle">Einschreibung in Gruppen</string>
<string name="openingTime">Öffnungsdatum den Gruppen: </string>
<string name="noGroupsText">Gruppen worden nicht im Kurs erstellt</string>
</resources>

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

@ -254,5 +254,6 @@ configuración mediante la opción "Limpiar base de datos" del menú\n\n¿Desea
<string name="sendMyGroupsProgressDescription">Enviando inscripción a grupos</string>
<string name="sendMyGroupsProgressTitle">Inscripción en grupos</string>
<string name="openingTime">Apertura de grupos: </string>
<string name="noGroupsText">No se han creado grupos dentro de la asignatura</string>
</resources>

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

@ -260,4 +260,5 @@ configuration anytime using the "Clean Database" option\n\nDo you want to contin
<string name="sendMyGroupsProgressDescription">Sending enrollment into groups</string>
<string name="sendMyGroupsProgressTitle">Enrolment into groups</string>
<string name="openingTime">Opening of groups: </string>
<string name="noGroupsText">No groups have been created in the course</string>
</resources>

3
SWADroid/src/es/ugr/swad/swadroid/modules/groups/GroupsResourceCursorTreeAdapter.java
View File

@ -126,8 +126,7 @@ public class GroupsResourceCursorTreeAdapter extends ResourceCursorTreeAdapter {
// Date d = new Date(unixTime * 1000);
// java.text.DateFormat dateShortFormat = android.text.format.DateFormat.getDateFormat(context);
// java.text.DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(context);
// openTimeText.setText(dateShortFormat.format(d));
// //openTimeText.setText(timeFormat.format(d));
// openTimeText.setText(dateShortFormat.format(d)+ " "+(timeFormat.format(d));
// }
}

12
SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java
View File

@ -91,8 +91,6 @@ public class MyGroupsManager extends MenuActivity {
courseCode = getIntent().getLongExtra("courseCode",-1);
setContentView(R.layout.group_choice);
this.findViewById(R.id.courseSelectedText).setVisibility(View.VISIBLE);
//in this module the group will not be chosen through the spinner,
@ -122,7 +120,15 @@ public class MyGroupsManager extends MenuActivity {
startActivityForResult(activity,Global.GROUPS_REQUEST_CODE);
break;
case Global.GROUPS_REQUEST_CODE:
setMenu();
if(dbHelper.getCursorGroupType(courseCode).getColumnCount() < 0){
expandableList.setVisibility(View.VISIBLE);
this.findViewById(R.id.noGroupsText).setVisibility(View.GONE);
setMenu();
}else{
expandableList.setVisibility(View.GONE);
this.findViewById(R.id.noGroupsText).setVisibility(View.VISIBLE);
}
break;
}