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

Fixed wrong loop in enrollment module when there are not group types

Browse Source
This commit is contained in:
Helena Rodriguez 2012-11-02 19:16:25 +01:00
parent 547d700788
commit a0f3e52851
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ public class Global {
/**
* SWAD application key
*/
private static final String AppKey = "";
private static final String AppKey = "HTC-Desire";
/**
* Server URL
*/

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

@ -51,6 +51,8 @@ public class MyGroupsManager extends MenuExpandableListActivity {
private ArrayList<Model> groupTypes;
private boolean groupTypesRequested = false;
@Override
protected void onStart() {
super.onStart();
@ -65,9 +67,11 @@ public class MyGroupsManager extends MenuExpandableListActivity {
activity.putExtra("courseCode", courseCode);
startActivityForResult(activity,Global.GROUPS_REQUEST_CODE);
}else{
Intent activity = new Intent(getBaseContext(),GroupTypes.class);
activity.putExtra("courseCode", courseCode);
startActivityForResult(activity,Global.GROUPTYPES_REQUEST_CODE);
if(!groupTypesRequested){
Intent activity = new Intent(getBaseContext(),GroupTypes.class);
activity.putExtra("courseCode", courseCode);
startActivityForResult(activity,Global.GROUPTYPES_REQUEST_CODE);
}
}
}
}
@ -111,9 +115,14 @@ public class MyGroupsManager extends MenuExpandableListActivity {
if (resultCode == Activity.RESULT_OK) {
switch (requestCode) {
case Global.GROUPTYPES_REQUEST_CODE:
Intent activity = new Intent(getBaseContext(),GroupTypes.class);
activity.putExtra("courseCode", courseCode);
startActivityForResult(activity,Global.GROUPS_REQUEST_CODE);
groupTypesRequested = true;
if(dbHelper.getAllRows(Global.DB_TABLE_GROUP_TYPES, "courseCode = " + courseCode , "groupTypeName").size() > 0){
//If there are not group types, either groups. Therefore, there is no need to request groups
Intent activity = new Intent(getBaseContext(),GroupTypes.class);
activity.putExtra("courseCode", courseCode);
startActivityForResult(activity,Global.GROUPS_REQUEST_CODE);
}else
setEmptyMenu();
break;
case Global.GROUPS_REQUEST_CODE:
if(dbHelper.getGroups(courseCode).size() > 0){
@ -121,11 +130,8 @@ public class MyGroupsManager extends MenuExpandableListActivity {
this.findViewById(R.id.sendMyGroupsButton).setVisibility(View.VISIBLE);
this.findViewById(R.id.noGroupsText).setVisibility(View.GONE);
setMenu();
}else{
getExpandableListView().setVisibility(View.GONE);
this.findViewById(R.id.sendMyGroupsButton).setVisibility(View.GONE);
this.findViewById(R.id.noGroupsText).setVisibility(View.VISIBLE);
}
}else
setEmptyMenu();
break;
case Global.SENDMYGROUPS_REQUEST_CODE:
@ -160,6 +166,11 @@ public class MyGroupsManager extends MenuExpandableListActivity {
.show();
}
private void setEmptyMenu(){
getExpandableListView().setVisibility(View.GONE);
this.findViewById(R.id.sendMyGroupsButton).setVisibility(View.GONE);
this.findViewById(R.id.noGroupsText).setVisibility(View.VISIBLE);
}
private void setMenu(){
groupTypes = (ArrayList<Model>) dbHelper.getAllRows(Global.DB_TABLE_GROUP_TYPES, "courseCode ="+ String.valueOf(courseCode), "groupTypeName");