diff --git a/SWADroid/AndroidManifest.xml b/SWADroid/AndroidManifest.xml
index 1b64d558..14967389 100644
--- a/SWADroid/AndroidManifest.xml
+++ b/SWADroid/AndroidManifest.xml
@@ -152,6 +152,11 @@
android:label="@string/documentsDownloadModuleLabel"
android:theme="@android:style/Theme.NoTitleBar" >
+
+
+ android:visibility="gone"
+ android:text="@string/myGroupsModuleLabel">
+
-
+ android:text="Prueba"/>
\ No newline at end of file
diff --git a/SWADroid/res/layout/group_type_list_item.xml b/SWADroid/res/layout/group_type_list_item.xml
new file mode 100644
index 00000000..d9e2d290
--- /dev/null
+++ b/SWADroid/res/layout/group_type_list_item.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SWADroid/res/values-ca/strings.xml b/SWADroid/res/values-ca/strings.xml
index c16878aa..7539b7ba 100644
--- a/SWADroid/res/values-ca/strings.xml
+++ b/SWADroid/res/values-ca/strings.xml
@@ -109,4 +109,6 @@
Vacants
+ Inscripció
+ Els meus grups
\ No newline at end of file
diff --git a/SWADroid/res/values-de/strings.xml b/SWADroid/res/values-de/strings.xml
index 9a371077..8a9e0e64 100644
--- a/SWADroid/res/values-de/strings.xml
+++ b/SWADroid/res/values-de/strings.xml
@@ -133,4 +133,6 @@ Es muss mindestens ein Antworttyp ausgewählt werden
Frei
Anzahl der Stud.
Max. Stud
+ Einschreibung
+ Meine Gruppen
\ No newline at end of file
diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml
index bef24621..39a35901 100644
--- a/SWADroid/res/values-es/strings.xml
+++ b/SWADroid/res/values-es/strings.xml
@@ -180,5 +180,6 @@
Vacantes
Nº de estud.
Máx.estud
-
+ Inscripción
+ Mis Grupos
diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml
index 4c1a1ff8..78df5612 100644
--- a/SWADroid/res/values/strings.xml
+++ b/SWADroid/res/values/strings.xml
@@ -185,4 +185,7 @@
Vacants
No. of stud.
Max.stud.
+ Enrollment
+ My groups
+
diff --git a/SWADroid/src/es/ugr/swad/swadroid/Global.java b/SWADroid/src/es/ugr/swad/swadroid/Global.java
index 65b64d95..a2b9cce6 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/Global.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/Global.java
@@ -130,11 +130,14 @@ public class Global {
* Request code for Downloads Manager
* */
public static final int DOWNLOADSMANAGER_REQUEST_CODE = 15;
-
/**
* Request code for Notify Download
* */
- public static final int NOTIFYDOWNLOAD_REQUEST_CODE = 15;
+ public static final int NOTIFYDOWNLOAD_REQUEST_CODE = 16;
+ /**
+ * Request code for MyGroups Manager
+ * */
+ public static final int MYGROUPSMANAGER_REQUEST_CODE= 17;
/**
* Prefix tag name for Logcat
*/
diff --git a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
index b09332b9..0847446c 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
@@ -58,6 +58,7 @@ import es.ugr.swad.swadroid.modules.Notices;
import es.ugr.swad.swadroid.modules.attendance.Attendance;
import es.ugr.swad.swadroid.modules.downloads.DownloadsManager;
import es.ugr.swad.swadroid.modules.downloads.DirectoryTreeDownload;
+import es.ugr.swad.swadroid.modules.groups.MyGroupsManager;
import es.ugr.swad.swadroid.modules.notifications.Notifications;
import es.ugr.swad.swadroid.modules.tests.Tests;
import es.ugr.swad.swadroid.ssl.SecureConnection;
@@ -119,10 +120,14 @@ public class SWADMain extends MenuExpandableListActivity {
* Group position inside the main menu for Course group
* */
private int COURSE_GROUP = 2;
+ /**
+ * Group position inside the main menu for Enrollment group
+ * */
+ private int ENROLLMENT_GROUP = 3;
/**
* Group position inside the main menu for User group
* */
- private int USERS_GROUP = 3;
+ private int USERS_GROUP = 4;
/**
* Child position inside the messages menu for Notification
* */
@@ -151,7 +156,10 @@ public class SWADMain extends MenuExpandableListActivity {
* Child position inside the users menu for Rollcall
* */
private int ROLLCALL_CHILD = 0;
-
+ /**
+ * Child position inside the enrollment menu for My Groups
+ * */
+ private int MYGROUPS_CHILD = 0;
/**
* Gets the database helper
@@ -234,6 +242,9 @@ public class SWADMain extends MenuExpandableListActivity {
/*activity = new Intent(getBaseContext(),DirectoryTreeDownload.class);
activity.putExtra("treeCode",Global.SHARE_AREA_CODE);
startActivityForResult(activity,Global.DIRECTORY_TREE_REQUEST_CODE);*/
+ }else if(keyword.equals(getString(R.string.myGroupsModuleLabel))){
+ activity = new Intent(getBaseContext(), MyGroupsManager.class);
+ startActivityForResult(activity,Global.MYGROUPSMANAGER_REQUEST_CODE);
}
return true;
@@ -495,11 +506,15 @@ public class SWADMain extends MenuExpandableListActivity {
evaluation.put(IMAGE, getResources().getDrawable(R.drawable.grades));
headerData.add( evaluation);
- //DISABLE until it will be functional
final HashMap courses = new HashMap();
courses.put(NAME, getString(R.string.course));
courses.put(IMAGE, getResources().getDrawable(R.drawable.blackboard));
headerData.add(courses);
+
+ final HashMap enrolment = new HashMap();
+ enrolment.put(NAME, getString(R.string.enrollment));
+ //enrolment.put(IMAGE, getResources().getDrawable(R.drawable.blackboard));
+ headerData.add(enrolment);
final ArrayList>> childData = new ArrayList>>();
@@ -512,6 +527,9 @@ public class SWADMain extends MenuExpandableListActivity {
//DISABLE until it will be functional
final ArrayList> documentsData = new ArrayList>();
childData.add(documentsData);
+
+ final ArrayList> enrollmentData = new ArrayList>();
+ childData.add(enrollmentData);
//Messages category
HashMap map = new HashMap();
@@ -541,6 +559,13 @@ public class SWADMain extends MenuExpandableListActivity {
map.put(NAME, getString(R.string.sharedsDownloadModuleLabel));
map.put(IMAGE, getResources().getDrawable(R.drawable.folderusers));
documentsData.add(map);
+
+
+ map = new HashMap();
+ map.put(NAME, getString(R.string.myGroupsModuleLabel));
+ //map.put(IMAGE, getResources().getDrawable(R.drawable.folder));
+ enrollmentData.add(map);
+
setListAdapter( new ImageExpandableListAdapter(
this,
headerData,
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java
new file mode 100644
index 00000000..4bb41104
--- /dev/null
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java
@@ -0,0 +1,80 @@
+package es.ugr.swad.swadroid.modules.groups;
+
+import com.android.dataframework.DataFramework;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.SimpleCursorTreeAdapter;
+import android.widget.TextView;
+import es.ugr.swad.swadroid.Global;
+import es.ugr.swad.swadroid.MenuActivity;
+import es.ugr.swad.swadroid.model.DataBaseHelper;
+import es.ugr.swad.swadroid.modules.Groups;
+import es.ugr.swad.swadroid.R;
+
+public class MyGroupsManager extends MenuActivity {
+ /**
+ * Database Framework.
+ */
+ protected static DataFramework db;
+ @Override
+ protected void onStart() {
+ // TODO Auto-generated method stub
+ super.onStart();
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ // Initialize database
+ try {
+ db = DataFramework.getInstance();
+ db.open(this, getPackageName());
+ dbHelper = new DataBaseHelper(db);
+ } catch (Exception ex) {
+ Log.e(ex.getClass().getSimpleName(), ex.getMessage());
+ ex.printStackTrace();
+ }
+
+ setContentView(R.layout.group_choice);
+ this.findViewById(R.id.courseSelectedText).setVisibility(View.VISIBLE);
+ this.findViewById(R.id.groupSpinner).setVisibility(View.GONE);
+
+ TextView courseNameText = (TextView) this.findViewById(R.id.courseSelectedText);
+ courseNameText.setText(Global.getSelectedCourseShortName());
+
+ //TODO Add icon for My Groups Module
+ //ImageView moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
+ //moduleIcon.setBackgroundResource(R.drawable.folder);
+
+ TextView moduleText = (TextView) this.findViewById(R.id.moduleName);
+ moduleText.setText(R.string.myGroupsModuleLabel);
+
+ Intent activity = new Intent(getBaseContext(),Groups.class);
+ startActivityForResult(activity,Global.GROUPS_REQUEST_CODE);
+
+ }
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (resultCode == Activity.RESULT_OK) {
+ switch (requestCode) {
+
+ case Global.GROUPS_REQUEST_CODE:
+ setMenu();
+ break;
+ }
+
+ }
+ }
+
+ private void setMenu(){
+ //TODO Set Adapter for Expandable list
+ }
+
+}