commit 2eb1055c3f136fc75e62ab56819a6873b0f8834b
parent 773f1fe606de315573000a3074548db4318620c1
Author: John Charron <rm_rf_windows@yahoo.fr>
Date: Wed, 23 Feb 2011 09:36:21 +0100
Merge branch 'master' of https://github.com/jsmaniac/2011-m1s2-ter
Diffstat:
8 files changed, 97 insertions(+), 81 deletions(-)
diff --git a/code/PtiClic/res/drawable-hdpi/icon.png b/code/PtiClic/res/drawable-hdpi/icon.png
Binary files differ.
diff --git a/code/PtiClic/res/drawable-ldpi/icon.png b/code/PtiClic/res/drawable-ldpi/icon.png
Binary files differ.
diff --git a/code/PtiClic/res/drawable-mdpi/icon.png b/code/PtiClic/res/drawable-mdpi/icon.png
Binary files differ.
diff --git a/code/serveur/php/download.php b/code/serveur/php/download.php
@@ -11,32 +11,32 @@ if(!isset($_SESSION['userId']))
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
<head>
- <title>PtiClic Android - Téléchargement</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="stylesheet" href="ressources/simple.css" />
+ <title>PtiClic Android - Téléchargement</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" href="ressources/simple.css" />
</head>
<body>
- <div class="menu">
- <?php include("ressources/menu.html"); ?>
- </div>
- <div class="content">
- <h2>Téléchargez la dernière version :</h2>
- > <a href="ressources/pticlic.apk" id="downloadlink">Télécharger</a>
- <h2>Installation de l'application :</h2>
+ <div class="menu">
+ <?php include("ressources/menu.html"); ?>
+</div>
+<div class="content">
+ <h2>Téléchargez la dernière version :</h2>
+ > <a href="ressources/pticlic.apk" id="downloadlink">Télécharger</a>
+ <h2>Installation de l'application :</h2>
<h3> A partir du téléphone </h3>
<ul>
<li> Téléchargez l'application en cliquant sur le lien ci-dessus.</li>
- <li> Un fois téléchargée Android vous demande si vous voulez l'installée, selectionnez oui.</li>
+ <li> Un fois téléchargée, clique sur l'application dans la barre de notification d'Android et suivez les instructions d'installation. </li>
<li> Patientez quelques instant. Une fois l'installation terminée démarrez l'application.</li>
<li> Suivez les instructions pour le premier démarrage de l'application</li>
- </ul>
- <h3> A partir d'un ordinateur </h3>
+ </ul>
+ <h3> A partir d'un ordinateur </h3>
<ul>
<li> Téléchargez sur votre ordinateur l'application en cliquant sur le lien ci-dessus. </li>
- <li> Transférez le fichier ainsi téléchargé sur votre téléphone (par bluetooth, usb...)</li>
- <li> Depuis votre téléphone allez cherchez sur votre carte mémoire l'application ainsi transférée.</li>
+ <li> Transférez le fichier ainsi téléchargé sur votre téléphone (par bluetooth, usb...)</li>
+ <li> Depuis votre téléphone allez cherchez sur votre carte mémoire l'application ainsi transférée.</li>
<li> Cliquez sur l'application et installé là sur le téléphone.</li>
- <li> Démarrez l'application et suivez les instructions pour le premier démarrage.</li>
+ <li> Démarrez l'application et suivez les instructions pour le premier démarrage.</li>
</ul>
</div>
<div class="footer">
diff --git a/code/serveur/php/index.php b/code/serveur/php/index.php
@@ -16,32 +16,38 @@ session_start();
<?php include("ressources/menu.html"); ?>
</div>
<div class="content">
- <h2>Jeu du PtiClic - Téléchargement gratuit</h2>
- <p>Vous aimer les jeux de mots ? Vous avez un smartphone Android ?
+ <h2>Jeu PtiClic - Téléchargement gratuit</h2>
+ <p>Vous aimez les jeux de mots ? Vous avez un smartphone sous Android ?
PtiClic est pour vous !</p>
<p>Soyez parmi les tous premiers à télécharger cette application gratuitement
- en devenant Alpha-testeur. L'inscription est simple. Il suffit de fournir une adresse mail, de créer un
+ en devenant Alpha-testeur. L'inscription est simple : Il suffit de fournir une adresse mail, de créer un
identifiant et vous pourrez commencer à jouer !</p>
- <p>Il ne s'agit pas d'une version d'essai et l'application ne contient aucun
- spyware.</p>
+ <!-- <p>Il ne s'agit pas d'une version d'essai et l'application ne contient aucun
+ spyware.</p> -->
<h2>Le principe du jeu</h2>
<p>Un mot central apparaît ainsi que quatre associations
telles que "synonyme", "antonyme", "est une sorte de", "corbeille". L'idée est
de lier de nouveaux mots au mot central à l'aide des associations.
- Plus votre réponse est juste, plus vous gagner des points.
+ Plus votre réponse est juste, plus vous gagnez de points.
Attention, vous pouvez aussi perdre des points !</p>
<h2>Le développement de l'application</h2>
- <p>La version beta du PtiClic sous Android est en cours de développement.
+ <p>La version beta du jeu PtiClic sous Android est en cours de développement.
Le projet s'inscrit dans le cadre d'un TER de Master en informatique
à l'Université Montpellier II sous la direction de Mathieu LAFOURCADE. L'équipe
- de conception et de développement est composée de quatre étudiants : Bertrand BRUN,
- Yoann BONAVERO, John CHARRON et Georges DUPERON.</p>
+ de conception et de développement est composée de quatre étudiants :
+ <ul>
+ <li>Bertrand BRUN,</li>
+ <li>Yoann BONAVERO,</li>
+ <li>John CHARRON</li>
+ <li>Georges DUPERON.</li>
+ </ul>
+ </p>
<h2>Votre rôle en tant qu'Alpha-testeur</h2>
<p>L'application étant en phase de développement et offerte gratuitement,
nous serions reconnaissant si vous pourriez nous donner votre avis, vos suggestions,
- vos idées. </p>
+ vos idées.</p>
</div>
<div class="footer">
<?php include("ressources/footer.html"); ?>
diff --git a/code/serveur/php/login.php b/code/serveur/php/login.php
@@ -1,6 +1,5 @@
<?php
session_start();
-include("_head.php");
if(isset($_POST['loginid']) && !empty($_POST['loginid']))
$user = SQLite3::escapeString($_POST['loginid']);
@@ -33,9 +32,16 @@ if(isset($user) && isset($pswd))
}
else if(isset($user) or isset($pswd))
$msg = "Veuillez remplir tous les champs";
-
-
?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+ <head>
+ <title>Titre</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" href="ressources/simple.css" />
+ </head>
<body>
<div class="menu">
<?php include("ressources/menu.html"); ?>
diff --git a/code/serveur/php/pticlic.php b/code/serveur/php/pticlic.php
@@ -64,7 +64,7 @@ $login_is_ok = ($hash_passwd == $db->querySingle("SELECT hash_passwd FROM user W
if ($action != 3 && (!$login_is_ok)) {
mDie(3,"Utilisateur non enregistré ou mauvais mot de passe");
}
-if ($action = 3) {
+if ($action == 3) {
if ($login_is_ok) {
echo '{"login_ok":true}';
} else {
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-02-08" view-index="0" gantt-divider-location="425" resource-divider-location="302" version="2.0">
+<project name="PticClic" company="" webLink="pticlic.org" view-date="2011-02-12" view-index="0" gantt-divider-location="425" resource-divider-location="302" version="2.0">
<description/>
<view zooming-state="default:2" id="gantt-chart"/>
<view id="resource-table">
@@ -36,11 +36,11 @@
<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="69" priority="1" expand="true">
+ <task id="2" name="Iteration 1" meeting="false" start="2011-01-17" duration="27" complete="85" 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"/>
- <task id="5" name="Serveur & SQL" meeting="false" start="2011-01-17" duration="7" complete="95" priority="1" expand="true">
+ <depend id="43" type="2" difference="0" hardness="Strong"/>
+ <task id="5" name="Serveur & SQL" meeting="false" start="2011-01-17" duration="7" complete="100" priority="1" expand="true">
<depend id="7" type="2" difference="0" hardness="Strong"/>
<depend id="8" type="2" difference="0" hardness="Strong"/>
<depend id="9" type="2" difference="0" hardness="Strong"/>
@@ -50,22 +50,22 @@
<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="50" priority="1" expand="true">
+ <task id="7" name="Fenetre de score" meeting="false" start="2011-01-24" duration="7" complete="100" 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="90" priority="1" expand="true">
+ <task id="8" name="Reseau client Android" meeting="false" start="2011-01-24" duration="7" complete="100" 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="100" 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">
+ <task id="10" name="Intégration client & serveur" meeting="false" start="2011-01-31" duration="1" complete="100" priority="1" expand="true">
<depend id="11" type="2" difference="0" hardness="Strong"/>
</task>
<task id="11" name="Amelioration" meeting="false" start="2011-02-01" duration="6" complete="50" priority="1" expand="true">
<depend id="12" type="2" difference="0" hardness="Strong"/>
</task>
- <task id="12" name="Test et debogage" meeting="false" start="2011-02-07" duration="5" complete="0" priority="1" expand="true">
+ <task id="12" name="Test et debogage" meeting="false" start="2011-02-07" duration="5" complete="40" priority="1" expand="true">
<depend id="13" type="2" difference="0" hardness="Strong"/>
</task>
<task id="13" name="Livraison" color="#8cb6ce" meeting="true" start="2011-02-12" duration="1" complete="0" priority="1" expand="true">
@@ -75,16 +75,20 @@
<task id="14" name="Alpha-test" meeting="false" start="2011-02-12" duration="23" complete="0" priority="1" expand="true">
<depend id="20" type="2" difference="0" hardness="Rubber"/>
</task>
- <task id="15" name="Iteration 2" meeting="false" start="2011-02-14" duration="33" complete="0" priority="1" expand="true">
+ <task id="15" name="Iteration 2" meeting="false" start="2011-02-14" duration="33" complete="14" priority="1" expand="true">
<depend id="25" type="2" difference="0" hardness="Rubber"/>
<depend id="26" type="2" difference="0" hardness="Rubber"/>
<depend id="28" type="2" difference="0" hardness="Rubber"/>
- <task id="16" name="Niveau de difficulte (serveur)" meeting="false" start="2011-02-14" duration="7" complete="0" priority="1" expand="true">
+ <task id="16" name="Niveau de difficulte (serveur)" meeting="false" start="2011-02-14" duration="7" complete="30" priority="1" expand="true">
<depend id="19" type="2" difference="0" hardness="Rubber"/>
</task>
- <task id="17" name="Mode de jeu : "Marathon"" meeting="false" start="2011-02-14" duration="14" complete="0" priority="1" expand="true">
+ <task id="17" name="Mode de jeu : "Marathon"" meeting="false" start="2011-02-21" duration="7" complete="0" priority="1" expand="true">
<depend id="19" type="2" difference="0" hardness="Rubber"/>
</task>
+ <task id="43" name="Site web pour les Beta-testeurs" color="#8cb6ce" meeting="false" start="2011-02-14" duration="14" complete="50" priority="1" expand="true">
+ <depend id="19" type="2" difference="0" hardness="Strong"/>
+ <depend id="20" type="2" difference="0" hardness="Strong"/>
+ </task>
<task id="18" name="Integration reseaux sociaux" meeting="false" start="2011-02-14" duration="14" complete="0" priority="1" expand="true">
<depend id="19" type="2" difference="0" hardness="Rubber"/>
</task>
@@ -167,94 +171,94 @@
<resource id="4" name="Alpha-testeurs" function="SoftwareDevelopment:4" contacts="" phone=""/>
</resources>
<allocations>
- <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="0" resource-id="0" function="Default:1" responsible="false" load="100.0"/>
<allocation task-id="0" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.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="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="1" resource-id="0" function="Default:1" responsible="false" load="25.0"/>
<allocation task-id="1" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="25.0"/>
- <allocation task-id="5" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="75.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="5" resource-id="1" 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="5" resource-id="3" 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="0" function="SoftwareDevelopment:2" responsible="false" load="50.0"/>
<allocation task-id="9" resource-id="0" function="Default:1" responsible="false" load="25.0"/>
<allocation task-id="9" resource-id="1" 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="2" 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="1" 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="2" 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="11" resource-id="0" function="Default:1" responsible="false" load="75.0"/>
<allocation task-id="11" resource-id="1" 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="2" 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="12" resource-id="0" function="Default:1" 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="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="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="16" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/>
+ <allocation task-id="17" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.0"/>
+ <allocation task-id="43" resource-id="2" function="0" responsible="false" load="100.0"/>
+ <allocation task-id="43" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/>
<allocation task-id="18" resource-id="0" function="Default:1" responsible="false" load="100.0"/>
- <allocation task-id="18" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.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="19" resource-id="0" function="Default:1" responsible="false" load="50.0"/>
<allocation task-id="19" resource-id="1" 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="2" 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="20" resource-id="0" function="Default:1" responsible="false" load="50.0"/>
<allocation task-id="20" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.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="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="21" resource-id="0" function="Default:1" responsible="false" load="100.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="23" resource-id="4" function="SoftwareDevelopment:4" responsible="false" load="100.0"/>
- <allocation task-id="25" resource-id="3" 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="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="26" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="50.0"/>
<allocation task-id="28" 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="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="29" resource-id="0" function="Default:1" responsible="false" load="50.0"/>
<allocation task-id="29" resource-id="1" 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="2" 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="30" resource-id="0" function="Default:1" responsible="false" load="50.0"/>
<allocation task-id="30" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.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="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="31" resource-id="0" function="Default:1" responsible="false" load="100.0"/>
<allocation task-id="31" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="100.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="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="32" resource-id="0" function="Default:1" responsible="true" load="25.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="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="3" 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="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="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="38" resource-id="3" function="SoftwareDevelopment:2" responsible="false" load="100.0"/>
<allocation task-id="39" resource-id="0" function="Default:1" responsible="false" load="50.0"/>
<allocation task-id="39" resource-id="1" 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="2" 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="40" resource-id="0" function="Default:1" responsible="false" load="50.0"/>
<allocation task-id="40" resource-id="1" function="SoftwareDevelopment:2" responsible="false" load="50.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"/>
+ <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="41" resource-id="0" function="Default:1" responsible="false" load="100.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"/>
</allocations>
<vacations/>
<taskdisplaycolumns>
