commit 1530ca16e0d6671b196d622f3176b7c7cfb387eb parent a3481da254d4b40b7d54c37f0522cb2dd528c93f Author: John Charron <rm_rf_windows@yahoo.fr> Date: Fri, 28 Jan 2011 12:58:17 +0100 Merge branch 'master' of https://github.com/jsmaniac/2011-m1s2-ter Diffstat:
16 files changed, 336 insertions(+), 74 deletions(-)
diff --git a/code/PtiClic/.classpath b/code/PtiClic/.classpath @@ -3,5 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> + <classpathentry kind="lib" path="lib/gson-1.6.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/code/PtiClic/AndroidManifest.xml b/code/PtiClic/AndroidManifest.xml @@ -12,7 +12,10 @@ </activity> <activity android:name=".Preference" android:label="Préférence"></activity> + <activity android:name=".Game"></activity> + <activity android:name=".Info" android:label="Information"></activity> + <activity android:name=".Score" android:label="Score"></activity> </application> -</manifest> -\ No newline at end of file +</manifest> diff --git a/code/PtiClic/lib/gson-1.6.jar b/code/PtiClic/lib/gson-1.6.jar Binary files differ. diff --git a/code/PtiClic/res/layout/game.xml b/code/PtiClic/res/layout/game.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<AbsoluteLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" android:orientation="vertical"> + <TextView android:id="@+id/mainWord" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="70" android:layout_gravity="center_horizontal" android:text="MainWord" android:layout_x="100px" android:layout_y="20px"></TextView> + <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/currentWord" android:layout_weight="10000" android:text="CurrentWord" android:layout_x="100px" android:layout_y="50px"></TextView> + <Button android:id="@+id/relation1" android:layout_height="wrap_content" android:text="R1" android:layout_width="wrap_content" android:layout_y="100px" android:layout_x="10px"></Button> + <Button android:id="@+id/relation2" android:layout_height="wrap_content" android:text="R2" android:layout_width="wrap_content" android:layout_y="100px" android:layout_x="70px"></Button> + <Button android:id="@+id/relation3" android:layout_height="wrap_content" android:text="R3" android:layout_width="wrap_content" android:layout_y="100px" android:layout_x="130px"></Button> + <Button android:id="@+id/relation4" android:layout_height="wrap_content" android:text="R4" android:layout_width="wrap_content" android:layout_x="190px" android:layout_y="100px"></Button> +</AbsoluteLayout> diff --git a/code/PtiClic/res/layout/info.xml b/code/PtiClic/res/layout/info.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" android:layout_height="fill_parent"> + + + +</LinearLayout> diff --git a/code/PtiClic/res/layout/main.xml b/code/PtiClic/res/layout/main.xml @@ -11,17 +11,21 @@ android:id="@+id/RelativeLayout01" android:layout_width="wrap_content" android:layout_gravity="bottom|center_horizontal"> - <Button android:layout_height="wrap_content" android:id="@+id/games" - android:text="@string/games_name" android:layout_width="wrap_content" + <Button android:layout_height="wrap_content" android:text="@string/play_label" android:layout_width="wrap_content" android:paddingLeft="60px" android:paddingRight="60px" - android:enabled="false" /> + android:id="@+id/play"/> <Button android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/prefs" - android:text="@string/prefs_name" android:layout_below="@+id/games" - android:layout_alignLeft="@+id/games" android:layout_alignRight="@+id/games" /> - - + android:text="@string/prefs_name" android:layout_below="@+id/play" + android:layout_alignLeft="@+id/play" android:layout_alignRight="@+id/play" /> + <!-- A SUPPRIMER : --> + <Button android:layout_height="wrap_content" + android:layout_width="wrap_content" android:id="@+id/voirscore" + android:text="Voir score" android:layout_below="@+id/prefs" + android:layout_alignLeft="@+id/prefs" + android:layout_alignRight="@+id/prefs" /> + <!-- FIN A SUPPRIMER --> </RelativeLayout> <LinearLayout android:id="@+id/LinearLayout01" @@ -32,8 +36,8 @@ android:layout_width="fill_parent" android:textStyle="bold" android:gravity="center_horizontal" android:text="@+id/login" android:id="@+id/login"></TextView> - <ImageView android:layout_height="wrap_content" android:id="@+id/info" - android:layout_width="wrap_content" android:src="@android:drawable/ic_dialog_info" android:layout_gravity="right" android:layout_weight="5"></ImageView> + <ImageButton android:layout_height="wrap_content" android:id="@+id/infoButton" + android:layout_width="wrap_content" android:src="@android:drawable/ic_dialog_info" android:layout_gravity="right" android:layout_weight="5"/> </LinearLayout> diff --git a/code/PtiClic/res/layout/score.xml b/code/PtiClic/res/layout/score.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> + + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +android:layout_height="fill_parent" android:orientation="vertical" +android:layout_width="fill_parent" android:id="@+id/LinearLayout01"> + + +<TextView android:text="@+id/corrects" android:id="@+id/corrects" android:layout_width="fill_parent" +android:layout_height="wrap_content" android:textSize="20px"></TextView> + +<TextView android:text="@+id/manquants" android:id="@+id/manquants" android:layout_width="fill_parent" +android:layout_height="wrap_content" android:textSize="20px"></TextView> + +<TextView android:text="@+id/mauvais" android:id="@+id/mauvais" android:layout_width="fill_parent" +android:layout_height="wrap_content" android:textSize="20px"></TextView> + +<TextView android:text="@+id/total" android:id="@+id/total" android:layout_width="fill_parent" +android:layout_height="wrap_content" android:textSize="25px"></TextView> + +<TextView android:text="@+id/joueravec" android:id="@+id/joueravec" android:layout_width="wrap_content" +android:layout_height="wrap_content" android:textSize="20px"></TextView> + +<Button android:text="J'ai vu !" android:id="@+id/jaivu" android:layout_width="100px" +android:layout_height="40px" android:layout_gravity="center_vertical|center_horizontal|center"></Button> + +<TextView android:text="@+id/category1" android:id="@+id/category1" android:layout_width="wrap_content" +android:layout_height="wrap_content" android:textSize="20px"></TextView> + +<TextView android:text="@+id/category1words" android:id="@+id/category1words" android:layout_width="wrap_content" +android:layout_height="wrap_content"></TextView> + +<TextView android:text="@+id/category2" android:id="@+id/category2" android:layout_width="wrap_content" +android:layout_height="wrap_content" android:textSize="20px"></TextView> + +<TextView android:text="@+id/category2words" android:id="@+id/category2words" android:layout_width="wrap_content" +android:layout_height="wrap_content"></TextView> + + +</LinearLayout> diff --git a/code/PtiClic/res/values/strings.xml b/code/PtiClic/res/values/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">PtiClic</string> -<string name="prefs_name">Préférences</string> -<string name="games_name">Jouer</string> + <string name="prefs_name">Préférences</string> + <string name="play_label">Jouer</string> </resources> diff --git a/code/PtiClic/src/model/GamePlayed.java b/code/PtiClic/src/model/GamePlayed.java @@ -0,0 +1,62 @@ +package model; + +import java.util.Arrays; + +public class GamePlayed { + + private int id; + private String centre; + private String[] cloud; + private String[] category; + private static GamePlayed instance = null; + + private GamePlayed(){ + this.id = -1; + this.centre = ""; + this.cloud = null; + this.category = null; + } + + private GamePlayed(int id, String centre, String[] cloud, String[] category) { + this.id = id; + this.centre = centre; + this.cloud = cloud; + this.category = category; + } + + public final static GamePlayed getInstance(){ + if(instance == null) instance = new GamePlayed(); + return instance; + } + + public int getId() { + return id; + } + public void setId(int id) { + this.id = id; + } + public String getCentre() { + return centre; + } + public void setCentre(String centre) { + this.centre = centre; + } + public String[] getCloud() { + return cloud; + } + public void setCloud(String[] cloud) { + this.cloud = cloud; + } + public String[] getCategory() { + return category; + } + public void setCategory(String[] category) { + this.category = category; + } + + @Override + public String toString() { + return "GamePlayed [id=" + id + ", centre=" + centre + ", cloud=" + + Arrays.toString(cloud) + ", category=" + category + "]"; + } +} diff --git a/code/PtiClic/src/org/pticlic/Game.java b/code/PtiClic/src/org/pticlic/Game.java @@ -0,0 +1,42 @@ +package org.pticlic; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.Button; + +public class Game extends Activity implements OnClickListener { + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + int nbrel = 2; + setContentView(R.layout.game); + + // Boutons des relations + Button r1 = ((Button)findViewById(R.id.relation1)); + Button r2 = ((Button)findViewById(R.id.relation2)); + Button r3 = ((Button)findViewById(R.id.relation3)); + Button r4 = ((Button)findViewById(R.id.relation4)); + + // Écoute des clics sur les relations + r1.setOnClickListener(this); + r2.setOnClickListener(this); + r3.setOnClickListener(this); + r4.setOnClickListener(this); + } + + /* (non-Javadoc) + * @see android.view.View.OnClickListener#onClick(android.view.View) + */ + @Override + public void onClick(View v) { + switch (v.getId()) { + case (R.id.relation1) : break; + case (R.id.relation2) : break; + case (R.id.relation3) : break; + case (R.id.relation4) : break; + } + } +} +\ No newline at end of file diff --git a/code/PtiClic/src/org/pticlic/Main.java b/code/PtiClic/src/org/pticlic/Main.java @@ -1,6 +1,9 @@ package org.pticlic; import android.app.Activity; +import android.app.AlertDialog; +import android.app.AlertDialog.Builder; +import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; @@ -8,28 +11,46 @@ import android.preference.PreferenceManager; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import android.widget.ImageButton; import android.widget.TextView; public class Main extends Activity implements OnClickListener { - + /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.main); - ((Button)findViewById(R.id.prefs)).setOnClickListener(this); - - // On récupère le nom du joueur des préférences. - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); - String loginPref = sp.getString("login", "joueur"); - // On l'ajoute dans le TextView prévu à cet effet - ((TextView)findViewById(R.id.login)).setText("Login : " + loginPref); - } + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + // Écoute des clics sur les différents boutons + ((Button)findViewById(R.id.prefs)).setOnClickListener(this); + ((Button)findViewById(R.id.play)).setOnClickListener(this); + // On récupère le nom du joueur des préférences. + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); + String loginPref = sp.getString("login", "joueur"); + // On l'ajoute dans le TextView prévu à cet effet + ((TextView)findViewById(R.id.login)).setText("Login : " + loginPref); + } + + /* (non-Javadoc) + * @see android.view.View.OnClickListener#onClick(android.view.View) + */ @Override public void onClick(View v) { - if (v.getId()==R.id.prefs) { - startActivity(new Intent(this, Preference.class)); + switch (v.getId()) { + case (R.id.prefs) : startActivity(new Intent(this, Preference.class)); break; + case (R.id.play) : startActivity(new Intent(this, Game.class)); break; + } + if (v.getId()==R.id.voirscore){ + // TODO: à supprimer + Intent intent = new Intent(this, Score.class); + intent.putExtra("corrects", 10); + intent.putExtra("mauvais", 2); + intent.putExtra("manquants", 1.5); + intent.putExtra("total", 10); // WHERE?? + startActivity(intent); } } + + } \ No newline at end of file diff --git a/code/PtiClic/src/org/pticlic/model/Constant.java b/code/PtiClic/src/org/pticlic/model/Constant.java @@ -0,0 +1,5 @@ +package org.pticlic.model; + +public class Constant { + public static final String SERVER_URL = "SERVER_URL"; +} diff --git a/code/PtiClic/src/org/pticlic/model/GamePlayed.java b/code/PtiClic/src/org/pticlic/model/GamePlayed.java @@ -0,0 +1,5 @@ +package org.pticlic.model; + +public class GamePlayed { + +} diff --git a/code/PtiClic/src/org/pticlic/model/Network.java b/code/PtiClic/src/org/pticlic/model/Network.java @@ -0,0 +1,57 @@ +package org.pticlic.model; + +import java.net.URI; +import java.net.URISyntaxException; + +import org.apache.http.HttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; + +import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; + +public class Network { + + public enum Action { + GET_GAMES + } + + public enum Mode { + SIMPLE_GAME + } + + private Mode mode; + private Context context; + + public Network(Context context, Mode mode) { + this.mode = mode; + this.context = context; + } + + + // TODO : faire se qui est la +// http://developer.android.com/reference/java/net/URLConnection.html#addRequestProperty%28java.lang.String,%20java.lang.String%29 + + public GamePlayed getGames(int nbGames) { + DefaultHttpClient httpClient = new DefaultHttpClient(); + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); + String serverUrl = sp.getString(Constant.SERVER_URL, "http://serveur/pticlic.php"); + + try { + HttpResponse res; + URI uri = new URI(serverUrl); + HttpPost methodPost = new HttpPost(uri); + //methodPost.setEntity(new StringEntity(s, charset)); + } catch (URISyntaxException e) { + return null; + } + + return null; + } + + public boolean sendGame(GamePlayed game) { + throw new UnsupportedOperationException(); + } +} diff --git a/organisation/pticlic.gan b/organisation/pticlic.gan @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="PticClic" company="" webLink="pticlic.org" view-date="2011-01-03" view-index="0" gantt-divider-location="425" resource-divider-location="302" version="2.0"> +<project name="PticClic" company="" webLink="pticlic.org" view-date="2011-01-10" view-index="0" gantt-divider-location="425" resource-divider-location="302" version="2.0"> <description/> <view zooming-state="default:3" id="gantt-chart"/> <view id="resource-table"> @@ -36,7 +36,7 @@ <depend id="6" type="2" difference="0" hardness="Rubber"/> </task> <task id="1" name="Recherche de beta-testeurs" meeting="false" start="2011-01-15" duration="28" complete="10" priority="1" expand="true"/> - <task id="2" name="Iteration 1" meeting="false" start="2011-01-17" duration="27" complete="25" priority="1" expand="true"> + <task id="2" name="Iteration 1" meeting="false" start="2011-01-17" duration="27" complete="35" priority="1" expand="true"> <depend id="16" type="2" difference="0" hardness="Rubber"/> <depend id="17" type="2" difference="0" hardness="Rubber"/> <depend id="18" type="2" difference="0" hardness="Rubber"/> @@ -50,13 +50,13 @@ <depend id="8" type="2" difference="0" hardness="Strong"/> <depend id="9" type="2" difference="0" hardness="Strong"/> </task> - <task id="7" name="Fenetre de score" meeting="false" start="2011-01-24" duration="7" complete="0" priority="1" expand="true"> + <task id="7" name="Fenetre de score" meeting="false" start="2011-01-24" duration="7" complete="20" priority="1" expand="true"> <depend id="10" type="2" difference="0" hardness="Strong"/> </task> - <task id="8" name="Reseau client Android" meeting="false" start="2011-01-24" duration="7" complete="0" priority="1" expand="true"> + <task id="8" name="Reseau client Android" meeting="false" start="2011-01-24" duration="7" complete="30" priority="1" expand="true"> <depend id="10" type="2" difference="0" hardness="Strong"/> </task> - <task id="9" name="Fenetre de jeu" meeting="false" start="2011-01-24" duration="7" complete="0" priority="1" expand="true"> + <task id="9" name="Fenetre de jeu" meeting="false" start="2011-01-24" duration="7" complete="20" priority="1" expand="true"> <depend id="10" type="2" difference="0" hardness="Strong"/> </task> <task id="10" name="Intégration client & serveur" meeting="false" start="2011-01-31" duration="1" complete="0" priority="1" expand="true"> @@ -166,99 +166,99 @@ <resources> <resource id="0" name="B. BRUN" function="Default:1" contacts="bertrand0brun@gmail.com" phone="+33 6 74 56 71 61"/> <resource id="1" name="G. DUPERON" function="SoftwareDevelopment:2" contacts="jahvascriptmaniac@gmail.com" phone="+33 6 88 95 57 92"/> - <resource id="2" name="J. CHARRON" function="SoftwareDevelopment:2" contacts="charron.john@gmail.com" phone="+33 6 71 78 84 50"/> + <resource id="2" name="J. CHARRON" function="0" contacts="charron.john@gmail.com" phone="+33 6 71 78 84 50"/> <resource id="3" name="Y. BONAVERO" function="SoftwareDevelopment:2" contacts="yoann.b87@voila.fr" phone="+33 6 45 48 34 89"/> <resource id="4" name="Alpha-testeurs" function="SoftwareDevelopment:4" contacts="" phone=""/> </resources> <allocations> <allocation task-id="0" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="0" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="0" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="0" resource-id="0" function="Default:1" responsible="false" load="100.0"/> + <allocation task-id="0" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> + <allocation task-id="0" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="1" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> - <allocation task-id="1" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> - <allocation task-id="1" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> <allocation task-id="1" resource-id="0" function="Default:1" responsible="false" load="25.0"/> + <allocation task-id="1" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> + <allocation task-id="1" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> <allocation task-id="5" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="5" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="6" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="6" resource-id="0" function="Default:1" responsible="false" load="75.0"/> + <allocation task-id="6" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="7" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="8" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> + <allocation task-id="8" resource-id="0" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="9" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="9" resource-id="0" function="Default:1" responsible="false" load="75.0"/> + <allocation task-id="9" resource-id="0" function="Default:1" responsible="false" load="25.0"/> <allocation task-id="10" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="10" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="10" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="10" resource-id="0" function="Default:1" responsible="false" load="75.0"/> + <allocation task-id="10" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> + <allocation task-id="10" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="11" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="11" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="11" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="11" resource-id="0" function="Default:1" responsible="false" load="75.0"/> + <allocation task-id="11" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> + <allocation task-id="11" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="12" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="12" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> - <allocation task-id="12" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="12" resource-id="0" function="Default:1" responsible="false" load="75.0"/> + <allocation task-id="12" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> + <allocation task-id="12" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="14" resource-id="4" function="SoftwareDevelopment:4" responsible="false" load="100.0"/> <allocation task-id="16" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> - <allocation task-id="17" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="17" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> + <allocation task-id="17" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="18" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="75.0"/> <allocation task-id="18" resource-id="0" function="Default:1" responsible="false" load="100.0"/> <allocation task-id="19" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="19" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="19" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="19" resource-id="0" function="Default:1" responsible="false" load="50.0"/> + <allocation task-id="19" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="19" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="20" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="20" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="20" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="20" resource-id="0" function="Default:1" responsible="false" load="50.0"/> + <allocation task-id="20" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="20" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="21" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="21" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="21" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="21" resource-id="0" function="Default:1" responsible="false" load="100.0"/> + <allocation task-id="21" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> + <allocation task-id="21" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="23" resource-id="4" function="SoftwareDevelopment:4" responsible="false" load="100.0"/> - <allocation task-id="25" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="25" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="26" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="25" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="26" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="26" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="27" resource-id="0" function="Default:1" responsible="false" load="100.0"/> <allocation task-id="28" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="29" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="29" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="29" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="29" resource-id="0" function="Default:1" responsible="false" load="50.0"/> + <allocation task-id="29" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="29" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="30" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="30" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="30" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="30" resource-id="0" function="Default:1" responsible="false" load="50.0"/> + <allocation task-id="30" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="30" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="31" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="31" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="31" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="31" resource-id="0" function="Default:1" responsible="false" load="100.0"/> + <allocation task-id="31" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> + <allocation task-id="31" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="32" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> - <allocation task-id="32" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> - <allocation task-id="32" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> <allocation task-id="32" resource-id="0" function="Default:1" responsible="true" load="25.0"/> + <allocation task-id="32" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> + <allocation task-id="32" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="25.0"/> <allocation task-id="33" resource-id="4" function="SoftwareDevelopment:4" responsible="false" load="100.0"/> <allocation task-id="35" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="36" resource-id="0" function="Default:1" responsible="false" load="100.0"/> - <allocation task-id="37" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="37" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="38" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> + <allocation task-id="37" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="38" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> + <allocation task-id="38" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="39" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="39" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="39" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="39" resource-id="0" function="Default:1" responsible="false" load="50.0"/> + <allocation task-id="39" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="39" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="40" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="40" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> - <allocation task-id="40" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="40" resource-id="0" function="Default:1" responsible="false" load="50.0"/> + <allocation task-id="40" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> + <allocation task-id="40" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="50.0"/> <allocation task-id="41" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="41" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> - <allocation task-id="41" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> <allocation task-id="41" resource-id="0" function="Default:1" responsible="false" load="100.0"/> + <allocation task-id="41" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> + <allocation task-id="41" resource-id="2" function="SoftwareDevelopment:2" responsible="false" load="100.0"/> </allocations> <vacations/> <taskdisplaycolumns> @@ -269,4 +269,7 @@ <previous/> <roles roleset-name="Default"/> <roles roleset-name="SoftwareDevelopment"/> + <roles> + <role id="0" name="Responsable communication"/> + </roles> </project> diff --git a/rapport/rapport.tex b/rapport/rapport.tex @@ -129,7 +129,7 @@ Android Developer, 2011. (\url{http://developer.android.com/}) Durée du projet 4 mois (4 itérations de 4 semaines) -Conventions de code : http://java.sun.com/docs/codeconv/html/CodeConventions.doc6.html +Conventions de code : \url{http://java.sun.com/docs/codeconv/html/CodeConventions.doc6.html} Code (noms de variables, etc.) en anglais, commentaires en français, javadoc en français.