suzanne.soy/2011-m1s2-ter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Petit nettoyage du code et correction d'un bug.

Browse Source
This commit is contained in:
Yoann 2011-04-17 17:31:17 +02:00
parent 6b57ca1ff9
commit 637dccaaa8
2 changed files with 3 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
code/serveur/php/createGamejs.php
View File

@ -4,157 +4,6 @@ require_once("relations.php");
require_once("server.php");
session_start();
$state = 0;
$err = false;
$msg = "";
$rels = array();
function getWords($nbwords)
{
global $msg;
global $err;
$words = array();
for($i = 0; $i < $nbwords; $i++)
if(!isset($_POST['word'.$i]) || empty($_POST['word'.$i])) {
$err = true;
$msg = $strings['err_creategame_fill_all'];
return -1;
}
else
$words[$i] = $_POST['word'.$i];
return $words;
}
function getWordsAndResponses($nbwords)
{
global $err;
global $msg;
$words = array();
$respwords = array();
$words = getWords($nbwords);
if($words == -1)
return -1;
foreach($words as $key=>$w) {
if(isset($_POST['rd'.$key])) {
$respwords[$key] = array();
$respwords[$key][0] = $words[$key];
$respwords[$key][1] = $_POST['rd'.$key];
}
else
return -1;
}
return $respwords;
}
function checked($name, $value) {
if(isset($_POST[$name]) && $_POST[$name] == $value)
return 'checked';
}
function probaOf($relation, $relation2) {
if (($relation == "r1" && $relation2 == 0)
|| ($relation == "r2" && $relation2 == 1)
|| ($relation == "r0" && $relation2 == 2)
|| ($relation == "trash" && $relation2 == 3))
return 1;
return 0;
}
if(isset($_POST['nbcloudwords'])) {
$nbwords = $_POST['nbcloudwords'];
if(!is_numeric($nbwords) || $nbwords <= 0) {
$err = true;
$msg = $strings['err_creategame_nbwords_value'];
}
else {
$state = 1;
$relations = get_game_relations();
}
if($state == 1 && isset($_POST['centralword']) && !empty($_POST['centralword'])) {
if($_POST['relation1'] != $_POST['relation2']) {
$centralword = $_POST['centralword'];
$rels[0] = $stringRelations[$_POST['relation1']];
$rels[1] = $stringRelations[$_POST['relation2']];
$rels[2] = $stringRelations[0];
$rels[3] = $stringRelations[-1];
$words = getWords($nbwords);
if($err != true)
$state = 2;
else {
$err = true;
$msg = $strings['err_creategame_cloud_fill_all'];
}
}
else {
$err = true;
$msg = $strings['err_creategame_eq_relations'];
}
}
elseif (isset($_POST['centralword']) && empty($_POST['centralword'])) {
$err = true;
$msg = $strings['err_creategame_cloud_fill_all'];
}
if($state == 2) {
$respwords = getWordsAndResponses($nbwords);
$r1 = $_POST['relation1'];
$r2 = $_POST['relation2'];
$cloud = array();
$totalDifficulty = 0;
$addedWords = 0;
if($respwords != -1 && isset($_POST['tDifficulty'])) {
if(is_numeric($totalDifficulty = $_POST['tDifficulty'])) {
if(insertNode($centralword))
$addedWords++;
$centralword = getNodeEid($centralword);
foreach($respwords as $key=>$rw) {
$difficulty = $totalDifficulty / count($respwords);
if(insertNode($respwords[$key][0]))
$addedWords++;
$cloud[$key] = array('pos'=>$key, 'd'=> $difficulty, 'eid'=>getNodeEid($respwords[$key][0]),
'probaR1'=> probaOf("r1", $rw[1]),
'probaR2'=> probaOf('r2', $rw[1]),
'probaR0'=> probaOf('r0', $rw[1]),
'probaTrash'=> probaOf('trash', $rw[1]));
}
}
else {
$err = true;
$msg = $strings['err_creategame_isNumeric_tDifficulty'];
}
$state = 3;
$msg = $strings['ok_creategame_game_create'];
}
cgInsert($centralword, $cloud, $r1, $r2, $totalDifficulty);
}
elseif($state == 2) {
$err = true;
$msg = $strings['err_creategame_fill_all'];
}
}
else
$err = true;
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

4
code/serveur/php/ressources/createGame.js
View File

@ -124,14 +124,16 @@ $(function() {
};
var badWord = function() {
console.log(wordsOK);
for (word in wordsOK)
if (wordsOK[word] == false)
if ($("#"+word).val() != "" && wordsOK[word] == false)
return true;
return false;
}
var relationsOK = function() {
console.log(wordsOK);
for(i = 1; i < numWord; i++) {
if(wordsOK["word-"+i]) {
if(!$("#r1-"+i).is(":checked") && !$("#r2-"+i).is(":checked") && !$("#r3-"+i).is(":checked") && !$("#r4-"+i).is(":checked"))