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

Completed courses module

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2011-01-21 10:43:15 +01:00
parent 46ad84b0d7
commit cc6167a3cc
8 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SWADroid/AndroidManifest.xml
View File

@ -19,7 +19,7 @@
android:name=".modules.Login"
android:label="@string/loginModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation" android:theme="@android:style/Theme.Dialog">
</activity>
<activity android:name=".modules.Courses"></activity>
<activity android:name=".modules.Courses" android:theme="@android:style/Theme.Dialog"></activity>
</application>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

47
SWADroid/gen/es/ugr/swad/swadroid/R.java
View File

@ -30,30 +30,31 @@ public final class R {
}
public static final class string {
public static final int app_name=0x7f060000;
public static final int close_dialog=0x7f060003;
public static final int errorCopyMsg_DB=0x7f060015;
public static final int errorMsgLaunchingActivity=0x7f060013;
public static final int errorMsgNoConnection=0x7f060016;
public static final int errorMsgWorkaroundEmulator=0x7f060014;
public static final int close_dialog=0x7f060004;
public static final int coursesModuleLabel=0x7f060002;
public static final int errorCopyMsg_DB=0x7f060016;
public static final int errorMsgLaunchingActivity=0x7f060014;
public static final int errorMsgNoConnection=0x7f060017;
public static final int errorMsgWorkaroundEmulator=0x7f060015;
public static final int loginModuleLabel=0x7f060001;
public static final int loginProgressDescription=0x7f060012;
public static final int loginProgressTitle=0x7f060011;
public static final int loginSuccessfulMsg=0x7f060018;
public static final int loginTitle_menu=0x7f060010;
public static final int preferencesTitle_menu=0x7f06000f;
public static final int saveMsg_preferences=0x7f06000c;
public static final int saveSummary_preferences=0x7f06000d;
public static final int saveTitle_preferences=0x7f06000e;
public static final int set_preferences=0x7f060004;
public static final int title_error_dialog=0x7f060002;
public static final int upgradeMsg_DB=0x7f060017;
public static final int userIDName_preferences=0x7f060006;
public static final int userIDSummary_preferences=0x7f060007;
public static final int userIDTitle_preferences=0x7f060008;
public static final int userPasswordName_preferences=0x7f060009;
public static final int userPasswordSummary_preferences=0x7f06000a;
public static final int userPasswordTitle_preferences=0x7f06000b;
public static final int user_preferences=0x7f060005;
public static final int loginProgressDescription=0x7f060013;
public static final int loginProgressTitle=0x7f060012;
public static final int loginSuccessfulMsg=0x7f060019;
public static final int loginTitle_menu=0x7f060011;
public static final int preferencesTitle_menu=0x7f060010;
public static final int saveMsg_preferences=0x7f06000d;
public static final int saveSummary_preferences=0x7f06000e;
public static final int saveTitle_preferences=0x7f06000f;
public static final int set_preferences=0x7f060005;
public static final int title_error_dialog=0x7f060003;
public static final int upgradeMsg_DB=0x7f060018;
public static final int userIDName_preferences=0x7f060007;
public static final int userIDSummary_preferences=0x7f060008;
public static final int userIDTitle_preferences=0x7f060009;
public static final int userPasswordName_preferences=0x7f06000a;
public static final int userPasswordSummary_preferences=0x7f06000b;
public static final int userPasswordTitle_preferences=0x7f06000c;
public static final int user_preferences=0x7f060006;
}
public static final class xml {
public static final int preferences=0x7f040000;

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="app_name">SWADroid</string>
<string name="loginModuleLabel">Conectar</string>
<string name="loginModuleLabel">Conectar</string><string name="coursesModuleLabel">Asignaturas</string>
<string name="title_error_dialog">ERROR</string>
<string name="close_dialog">Cerrar</string>
<string name="set_preferences">Configuración</string>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="app_name">SWADroid</string>
<string name="loginModuleLabel">Login</string>
<string name="loginModuleLabel">Login</string><string name="coursesModuleLabel">Courses</string>
<string name="title_error_dialog">ERROR</string>
<string name="close_dialog">Close</string>
<string name="set_preferences">Preferences</string>

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

@ -27,7 +27,7 @@ public class Global {
/**
* SWAD application key
*/
private static final String AppKey = "HTC-Desire";
private static final String AppKey = "";
/**
* User logged flag
*/
@ -40,6 +40,10 @@ public class Global {
* Request code for Login module.
*/
public static final int LOGIN_REQUEST_CODE = 1;
/**
* Request code for Courses module.
*/
public static final int COURSES_REQUEST_CODE = 2;
/**
* Student type constant
*/

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

@ -36,7 +36,6 @@ import android.widget.ListView;
import android.widget.Toast;
import es.ugr.swad.swadroid.model.DataBaseHelper;
import es.ugr.swad.swadroid.modules.Courses;
import es.ugr.swad.swadroid.modules.Login;
import es.ugr.swad.swadroid.ssl.SecureConnection;
/**
@ -47,8 +46,7 @@ public class SWADMain extends ListActivity {
/**
* Application preferences.
*/
protected static Preferences prefs = new Preferences();
protected static Preferences prefs = new Preferences();
/**
* Database Helper.
*/
@ -56,7 +54,7 @@ public class SWADMain extends ListActivity {
/**
* Database Framework.
*/
protected static DataFramework db;
private static DataFramework db;
/**
* Array of strings for main ListView
*/
@ -107,7 +105,7 @@ public class SWADMain extends ListActivity {
case R.id.login_menu:
Intent loginActivity = new Intent(getBaseContext(),
Courses.class);
startActivityForResult(loginActivity, Global.LOGIN_REQUEST_CODE);
startActivityForResult(loginActivity, Global.COURSES_REQUEST_CODE);
return true;
case R.id.preferences_menu:
viewPreferences();
@ -125,23 +123,10 @@ public class SWADMain extends ListActivity {
if (resultCode == ListActivity.RESULT_OK) {
//Bundle extras = data.getExtras();
switch(requestCode) {
/*switch(requestCode) {
case Global.LOGIN_REQUEST_CODE:
Global.setLogged(true);
Toast.makeText(getBaseContext(),
R.string.loginSuccessfulMsg,
Toast.LENGTH_LONG).show();
Log.d(Global.LOGIN_TAG, getString(R.string.loginSuccessfulMsg));
/*Log.d(Global.LOGIN_TAG, "userCode=" + User.getUserCode());
Log.d(Global.LOGIN_TAG, "userTypeCode=" + User.getUserTypeCode());
Log.d(Global.LOGIN_TAG, "userTypeName=" + User.getUserTypeName());
Log.d(Global.LOGIN_TAG, "userID=" + User.getUserID());
Log.d(Global.LOGIN_TAG, "userFirstName=" + User.getUserFirstName());
Log.d(Global.LOGIN_TAG, "userSurname1=" + User.getUserSurname1());
Log.d(Global.LOGIN_TAG, "userSurname2=" + User.getUserSurname2());
Log.d(Global.LOGIN_TAG, "wsKey=" + User.getWsKey());*/
break;
}
}*/
}
}

10
SWADroid/src/es/ugr/swad/swadroid/model/DataBaseHelper.java
View File

@ -342,9 +342,17 @@ public class DataBaseHelper {
where = params.getFirst() + " = " + first + " AND " + params.getSecond() + " = " + second;
Log.d("removePairTable", where);
rows = db.getEntityList(table, where);
ent = rows.get(0);
ent.delete();
}
/**
* Empty table from database
* @param table Table to be emptied
*/
public void emptyTable(String table)
{
db.emptyTable(table);
}
}

13
SWADroid/src/es/ugr/swad/swadroid/modules/Courses.java
View File

@ -28,6 +28,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.os.Bundle;
import android.util.Log;
import es.ugr.swad.swadroid.Global;
import es.ugr.swad.swadroid.R;
import es.ugr.swad.swadroid.model.Course;
import es.ugr.swad.swadroid.model.User;
@ -44,14 +45,13 @@ public class Courses extends Module {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setMETHOD_NAME("getCourses");
connect();
}
/**
* Launches courses action in a separate thread while shows a progress dialog
* Launches action in a separate thread while shows a progress dialog
* in UI thread.
*/
private void connect() {
protected void connect() {
String progressDescription = "Asignaturas";
int progressTitle = R.string.loginProgressTitle;
@ -76,16 +76,17 @@ public class Courses extends Module {
sendRequest(Course.class, false);
if (result != null) {
dbHelper.emptyTable(Global.DB_TABLE_COURSES);
//Stores courses data returned by webservice response
Vector res = (Vector) result;
SoapObject soap = (SoapObject) res.get(1);
Course[] cs = new Course[soap.getPropertyCount()];
for (int i = 0; i < cs.length; i++) {
int csSize = soap.getPropertyCount();
for (int i = 0; i < csSize; i++) {
SoapObject pii = (SoapObject)soap.getProperty(i);
int id = Integer.parseInt(pii.getProperty(0).toString());
String name = pii.getProperty(1).toString();
Course c = new Course(id, name);
cs[i] = c;
dbHelper.insertCourse(c);
Log.d("Courses", c.toString());
}