Author: Fabrizio
Date: 2010-01-29 00:38:37 +0100 (Fri, 29 Jan 2010)
New Revision: 27295
Added:
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersFormFilter.class.php
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersTranslationFormFilter.class.php
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsFormFilter.class.php
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsTranslationFormFilter.class.php
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersForm.class.php
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersTranslationForm.class.php
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsForm.class.php
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsTranslationForm.class.php
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswers.class.php
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswersTable.class.php
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestions.class.php
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestionsTable.class.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_boardPlayer.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_next_question.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/correctAnswerSuccess.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/endGameSuccess.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/namesOfPlayersSuccess.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/wrongAnswerSuccess.php
Modified:
plugins/sfQuizPlugin/trunk/config/doctrine/schema.yml
plugins/sfQuizPlugin/trunk/config/routing.yml
plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml
plugins/sfQuizPlugin/trunk/i18n/it/messages.xml
plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/components.class.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/gameSuccess.php
plugins/sfQuizPlugin/trunk/web/css/quizPlugin.css
Log:
[sfQuizPlugin] Refactoring and translations
Modified: plugins/sfQuizPlugin/trunk/config/doctrine/schema.yml
===================================================================
--- plugins/sfQuizPlugin/trunk/config/doctrine/schema.yml 2010-01-28
23:20:37 UTC (rev 27294)
+++ plugins/sfQuizPlugin/trunk/config/doctrine/schema.yml 2010-01-28
23:38:37 UTC (rev 27295)
@@ -2,7 +2,7 @@
tableName: quiz
actAs:
I18n:
- fields: [nome, descrizione]
+ fields: [title, description]
columns:
id:
type: integer(4)
@@ -11,27 +11,27 @@
nome:
type: string(50)
notnull: false
- descrizione:
+ description:
type: string(2147483647)
notnull: true
-QuizDomande:
- tableName: quiz_domande
+QuizQuestions:
+ tableName: quiz_questions
actAs:
Timestampable:
created:
- name: creato_il
+ name: created_at
type: timestamp
format: Y-m-d H:i:s
options:
notnull: true
updated:
- name: aggiornato_il
+ name: updated_at
type: timestamp
format: Y-m-d H:i:s
options:
notnull: true
I18n:
- fields: [domanda]
+ fields: [question]
columns:
id:
type: integer(4)
@@ -39,64 +39,64 @@
autoincrement: true
quiz_id:
type: integer(4)
- domanda:
+ question:
type: string(2147483647)
notnull: true
- tipo_risposta:
+ type_response:
type: enum(8)
- values: ['singola', 'multipla']
- default: 'singola'
+ values: ['single', 'multiple']
+ default: 'single'
notnull: true
immagine:
type: string(50)
notnull: true
- argomenti_id: integer(1)
+ topics_id: integer(1)
relations:
Quiz:
local: quiz_id
foreign: id
type: one
- Argomenti:
- local: argomenti_id
+ Topics:
+ local: topics_id
foreign: id
type: one
-QuizRisposte:
- tableName: quiz_risposte
+QuizAnswers:
+ tableName: quiz_answers
actAs:
Timestampable:
created:
- name: creato_il
+ name: created_at
type: timestamp
format: Y-m-d H:i:s
options:
notnull: true
updated:
- name: aggiornato_il
+ name: updated_at
type: timestamp
format: Y-m-d H:i:s
options:
notnull: true
I18n:
- fields: [risposta, commento]
+ fields: [answer, comment]
columns:
id:
type: integer(4)
primary: true
autoincrement: true
- quiz_domande_id:
+ quiz_questions_id:
type: integer(4)
default: '0'
notnull: true
- risposta:
+ answer:
type: string(2147483647)
notnull: true
- giusta:
+ correct:
type: boolean
default: false
notnull: true
- commento: string(2147483647)
+ comment: string(2147483647)
relations:
- QuizDomande:
- local: quiz_domande_id
+ QuizQuestions:
+ local: quiz_questions_id
foreign: id
type: one
\ No newline at end of file
Modified: plugins/sfQuizPlugin/trunk/config/routing.yml
===================================================================
--- plugins/sfQuizPlugin/trunk/config/routing.yml 2010-01-28 23:20:37 UTC
(rev 27294)
+++ plugins/sfQuizPlugin/trunk/config/routing.yml 2010-01-28 23:38:37 UTC
(rev 27295)
@@ -1,24 +1,24 @@
quiz:
- url: /quiz/:sf_culture
+ url: :sf_culture/quiz
param: { module: sfQuizStart, action: index }
sf_culture: (?:it|en|fr|es)
quiz-names-of-players:
- url: /quiz/names-of-player/:sf_culture
+ url: :sf_culture/quiz/names-of-player
param: { module: sfQuizStart, action: namesOfPlayers }
sf_culture: (?:it|en|fr|es)
quiz-game:
- url: /quiz/game/:sf_culture
+ url: :sf_culture/quiz/game
param: { module: sfQuizStart, action: game }
sf_culture: (?:it|en|fr|es)
quiz-correct-answer:
- url: /quiz/correct-answer/:sf_culture
+ url: :sf_culture/quiz/correct-answer
param: { module: sfQuizStart, action: correctAnswer }
sf_culture: (?:it|en|fr|es)
quiz-wrong-answer:
- url: /quiz/wrong-answer/:sf_culture
+ url: :sf_culture/quiz/wrong-answer
param: { module: sfQuizStart, action: wrongAnswer }
sf_culture: (?:it|en|fr|es)
quiz-end-game:
- url: /quiz/end-game/:sf_culture
+ url: :sf_culture/quiz/end-game
param: { module: sfQuizStart, action: endGame }
sf_culture: (?:it|en|fr|es)
\ No newline at end of file
Modified: plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml
===================================================================
--- plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml 2010-01-28 23:20:37 UTC
(rev 27294)
+++ plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml 2010-01-28 23:38:37 UTC
(rev 27295)
@@ -2,286 +2,286 @@
Quiz01:
Translation:
it:
- nome: Quiz su symfony
- descrizione: >
+ title: Quiz su symfony
+ description: >
Questo è un quiz utilizzato per lo sviluppo del plugin sfQuizPlugin
di symfony
en:
- nome: Quiz symfony
- descrizione: >
+ title: Quiz symfony
+ description: >
This is a quiz used for the development of the symfony plugin
sfQuizPlugin
-QuizDomande:
- Domanda01:
+QuizQuestions:
+ Question01:
Quiz: Quiz01
Translation:
it:
- domanda: In symfony 1.4, qual'è l'ORM predefinito?
+ question: In symfony 1.4, qual'è l'ORM predefinito?
en:
- domanda: With symfony 1.4, what is the default ORM?
- tipo_risposta: singola
- Domanda02:
+ question: With symfony 1.4, what is the default ORM?
+ type_response: singola
+ Question02:
Quiz: Quiz01
Translation:
it:
- domanda: Con quale versione di PHP funziona symfony 2?
+ question: Con quale versione di PHP funziona symfony 2?
en:
- domanda: With which version of PHP works symfony 2?
- tipo_risposta: singola
- Domanda03:
+ question: With which version of PHP works symfony 2?
+ type_response: singola
+ Question03:
Quiz: Quiz01
Translation:
it:
- domanda: >
+ question: >
In symfony 1.4 quando si cancella una tabella di Doctrine dal file
yaml e si ricostruiscono
le classi dei modelli, dei form e dei filtri con ./symfony
doctrine:build --all le classi
relative alle tabelle cancellate rimangono. Come si fa ad eliminarle?
en:
- domanda: >
+ question: >
In symfony 1.4 when you erase a table of the Doctrine YAML file and
rebuild the classes of
models, forms and filters with ./symfony doctrine:build --all the
classes canceled for
tables remain. How do I remove them?
- tipo_risposta: singola
- Domanda04:
+ type_response: singola
+ Question04:
Quiz: Quiz01
Translation:
it:
- domanda: In symfony 1.4 qual'è la convenzione per le azioni?
+ question: In symfony 1.4 qual'è la convenzione per le azioni?
en:
- domanda: In symfony 1.4 what is the convention for the actions?
- tipo_risposta: singola
- Domanda05:
+ question: In symfony 1.4 what is the convention for the actions?
+ type_response: singola
+ Question05:
Quiz: Quiz01
Translation:
it:
- domanda: Quale dei seguenti libri cartacei non è mai esistito?
+ question: Quale dei seguenti libri cartacei non è mai esistito?
en:
- domanda: Which of the following paper books never existed?
- tipo_risposta: singola
-QuizRisposte:
- Risposta01a:
+ question: Which of the following paper books never existed?
+ type_response: singola
+QuizAnswers:
+ Answer01a:
Translation:
it:
- risposta: Propel
- commento: No, propel era l'ORM predefinito nelle versioni precedenti
alla 1.3
+ answer: Propel
+ comment: No, propel era l'ORM predefinito nelle versioni precedenti
alla 1.3
en:
- risposta: Propel
- commento: No, propel ORM was the default in versions prior to 1.3
- QuizDomande: Domanda01
- giusta: false
- Risposta01b:
+ answer: Propel
+ comment: No, propel ORM was the default in versions prior to 1.3
+ QuizQuestions: Question01
+ correct: false
+ Answer01b:
Translation:
it:
- risposta: Doctrine
+ answer: Doctrine
en:
- risposta: Doctrine
- QuizDomande: Domanda01
- giusta: true
- Risposta01c:
+ answer: Doctrine
+ QuizQuestions: Question01
+ correct: true
+ Answer01c:
Translation:
it:
- risposta: Rocks
- commento: http://en.wikipedia.org/wiki/Rocks_%28PHP%29
+ answer: Rocks
+ comment: http://en.wikipedia.org/wiki/Rocks_%28PHP%29
en:
- risposta: Rocks
- commento: http://en.wikipedia.org/wiki/Rocks_%28PHP%29
- QuizDomande: Domanda01
- giusta: false
- Risposta01d:
+ answer: Rocks
+ comment: http://en.wikipedia.org/wiki/Rocks_%28PHP%29
+ QuizQuestions: Question01
+ correct: false
+ Answer01d:
Translation:
it:
- risposta: Redbean
- commento: http://en.wikipedia.org/wiki/Redbean_%28software%29
+ answer: Redbean
+ comment: http://en.wikipedia.org/wiki/Redbean_%28software%29
en:
- risposta: Redbean
- commento: http://en.wikipedia.org/wiki/Redbean_%28software%29
- QuizDomande: Domanda01
- giusta: false
- Risposta01e:
+ answer: Redbean
+ comment: http://en.wikipedia.org/wiki/Redbean_%28software%29
+ QuizQuestions: Question01
+ correct: false
+ Answer01e:
Translation:
it:
- risposta: Torpor
- commento: http://en.wikipedia.org/wiki/Torpor_%28PHP%29
+ answer: Torpor
+ comment: http://en.wikipedia.org/wiki/Torpor_%28PHP%29
en:
- risposta: Torpor
- commento: http://en.wikipedia.org/wiki/Torpor_%28PHP%29
- QuizDomande: Domanda01
- giusta: false
- Risposta02a:
- QuizDomande: Domanda02
- giusta: false
+ answer: Torpor
+ comment: http://en.wikipedia.org/wiki/Torpor_%28PHP%29
+ QuizQuestions: Question01
+ correct: false
+ Answer02a:
+ QuizQuestions: Question02
+ correct: false
Translation:
it:
- risposta: PHP >= 5.0
+ answer: PHP >= 5.0
en:
- risposta: PHP >= 5.0
- Risposta02b:
- QuizDomande: Domanda02
- giusta: false
+ answer: PHP >= 5.0
+ Answer02b:
+ QuizQuestions: Question02
+ correct: false
Translation:
it:
- risposta: PHP >= 5.2.4
+ answer: PHP >= 5.2.4
en:
- risposta: PHP >= 5.2.4
- Risposta02c:
- QuizDomande: Domanda02
- giusta: true
+ answer: PHP >= 5.2.4
+ Answer02c:
+ QuizQuestions: Question02
+ correct: true
Translation:
it:
- risposta: PHP >= 5.3
+ answer: PHP >= 5.3
en:
- risposta: PHP >= 5.3
- Risposta02d:
- QuizDomande: Domanda02
- giusta: false
+ answer: PHP >= 5.3
+ Answer02d:
+ QuizQuestions: Question02
+ correct: false
Translation:
it:
- risposta: PHP >= 6.0
+ answer: PHP >= 6.0
en:
- risposta: PHP >= 6.0
- Risposta02e:
- QuizDomande: Domanda02
- giusta: false
+ answer: PHP >= 6.0
+ Answer02e:
+ QuizQuestions: Question02
+ correct: false
Translation:
it:
- risposta: PHP >= 4.0
- commento: La versione 4 di PHP venne rilasciata nel 2000. Nessuna
versione di symfony ha mai supportato PHP 4.x
+ answer: PHP >= 4.0
+ comment: La versione 4 di PHP venne rilasciata nel 2000. Nessuna
versione di symfony ha mai supportato PHP 4.x
it:
- risposta: PHP >= 4.0
- commento: The version 4 of PHP was released in 2000. No version of
symfony has ever supported PHP 4.x
- Risposta03a:
- QuizDomande: Domanda03
- giusta: false
+ answer: PHP >= 4.0
+ comment: The version 4 of PHP was released in 2000. No version of
symfony has ever supported PHP 4.x
+ Answer03a:
+ QuizQuestions: Question03
+ correct: false
Translation:
it:
- risposta: L'unico modo è cancellare a mano tutte le classi rimaste
orfane
+ answer: L'unico modo è cancellare a mano tutte le classi rimaste orfane
en:
- risposta: The only way is to manually remove all the orphan classes
- Risposta03b:
- QuizDomande: Domanda03
- giusta: false
+ answer: The only way is to manually remove all the orphan classes
+ Answer03b:
+ QuizQuestions: Question03
+ correct: false
Translation:
it:
- risposta: ./symfony clear:cache
+ answer: ./symfony clear:cache
en:
- risposta: ./symfony clear:cache
- Risposta03c:
- QuizDomande: Domanda03
- giusta: false
+ answer: ./symfony clear:cache
+ Answer03c:
+ QuizQuestions: Question03
+ correct: false
Translation:
it:
- risposta: ./symfony clear:doctrine-classes
+ answer: ./symfony clear:doctrine-classes
en:
- risposta: ./symfony clear:doctrine-classes
- Risposta03d:
- QuizDomande: Domanda03
- giusta: true
+ answer: ./symfony clear:doctrine-classes
+ Answer03d:
+ QuizQuestions: Question03
+ correct: true
Translation:
it:
- risposta: ./symfony doctrine:clean-model-files
+ answer: ./symfony doctrine:clean-model-files
en:
- risposta: ./symfony doctrine:clean-model-files
- Risposta03e:
- QuizDomande: Domanda03
- giusta: false
+ answer: ./symfony doctrine:clean-model-files
+ Answer03e:
+ QuizQuestions: Question03
+ correct: false
Translation:
it:
- risposta: ./symfony doctrine:clear-classes
+ answer: ./symfony doctrine:clear-classes
en:
- risposta: ./symfony doctrine:clear-classes
- Risposta04a:
- QuizDomande: Domanda04
- giusta: true
+ answer: ./symfony doctrine:clear-classes
+ Answer04a:
+ QuizQuestions: Question04
+ correct: true
Translation:
it:
- risposta: >
+ answer: >
Ogni azione è rappresentata da un metodo di una classe.
La classe è il nome del modulo seguito dal suffisso Actions
en:
- risposta: >
+ answer: >
Each action is represented by a method of a class.
The class is the module name followed by the suffix Actions
- Risposta04b:
- QuizDomande: Domanda04
- giusta: false
+ Answer04b:
+ QuizQuestions: Question04
+ correct: false
Translation:
it:
- risposta: >
+ answer: >
Ogni azione è rappresentata da una classe.
Il nome della classe associata all'azione ha il suffisso Actions
en:
- risposta: >
+ answer: >
Each action is represented by a class.
The name of the associated class action has the suffix Actions
- Risposta04c:
- QuizDomande: Domanda04
- giusta: false
+ Answer04c:
+ QuizQuestions: Question04
+ correct: false
Translation:
it:
- risposta: Ogni azione è rappresentata da un helper che ha come
prefisso Actions
+ answer: Ogni azione è rappresentata da un helper che ha come prefisso
Actions
en:
- risposta: Each action is represented by a helper who is prefixed with
Actions
- Risposta04d:
- QuizDomande: Domanda04
- giusta: false
+ answer: Each action is represented by a helper who is prefixed with
Actions
+ Answer04d:
+ QuizQuestions: Question04
+ correct: false
Translation:
it:
- risposta: >
+ answer: >
Ogni azione è rappresentata da una classe.
Il nome della classe associata all'azione ha il prefisso Actions
en:
- risposta: >
+ answer: >
Each action is represented by a class.
The name of the associated class action has the prefix Actions
- Risposta04e:
- QuizDomande: Domanda04
- giusta: false
+ Answer04e:
+ QuizQuestions: Question04
+ correct: false
Translation:
it:
- risposta: >
+ answer: >
Ogni azione è rappresentata da un metodo statico.
Tali metodi hanno il prefisso Actions
en:
- risposta: >
+ answer: >
Each action is represented by a static method.
These methods have the prefix Actions
- Risposta05a:
- QuizDomande: Domanda05
- giusta: false
+ Answer05a:
+ QuizQuestions: Question05
+ correct: false
Translation:
it:
- risposta: La guida di riferimento a symfony 1.2
+ answer: La guida di riferimento a symfony 1.2
en:
- risposta: The symfony Reference Book
- Risposta05b:
- QuizDomande: Domanda05
- giusta: false
+ answer: The symfony Reference Book
+ Answer05b:
+ QuizQuestions: Question05
+ correct: false
Translation:
it:
- risposta: symfony in pratica, seconda edizione. symfony 1.2 | Doctrine
+ answer: symfony in pratica, seconda edizione. symfony 1.2 | Doctrine
en:
- risposta: Practical symfony, second edition. symfony 1.2 | Doctrine
- Risposta05c:
- QuizDomande: Domanda05
- giusta: false
+ answer: Practical symfony, second edition. symfony 1.2 | Doctrine
+ Answer05c:
+ QuizQuestions: Question05
+ correct: false
Translation:
it:
- risposta: Di più con symfony
+ answer: Di più con symfony
en:
- risposta: More with symfony
- Risposta05d:
- QuizDomande: Domanda05
- giusta: false
+ answer: More with symfony
+ Answer05d:
+ QuizQuestions: Question05
+ correct: false
Translation:
it:
- risposta: The Definitive Guide to symfony
+ answer: The Definitive Guide to symfony
en:
- risposta: The Definitive Guide to symfony
- Risposta05e:
- QuizDomande: Domanda05
- giusta: true
+ answer: The Definitive Guide to symfony
+ Answer05e:
+ QuizQuestions: Question05
+ correct: true
Translation:
it:
- risposta: symfony for dummies
+ answer: symfony for dummies
en:
- risposta: symfony for dummies
\ No newline at end of file
+ answer: symfony for dummies
\ No newline at end of file
Modified: plugins/sfQuizPlugin/trunk/i18n/it/messages.xml
===================================================================
--- plugins/sfQuizPlugin/trunk/i18n/it/messages.xml 2010-01-28 23:20:37 UTC
(rev 27294)
+++ plugins/sfQuizPlugin/trunk/i18n/it/messages.xml 2010-01-28 23:38:37 UTC
(rev 27295)
@@ -9,7 +9,7 @@
<target>Giusta</target>
</trans-unit>
<trans-unit id="2">
- <source>Wrong%</source>
+ <source>Wrong</source>
<target>Sbagliata</target>
</trans-unit>
<trans-unit id="3">
@@ -30,7 +30,7 @@
</trans-unit>
<trans-unit id="7">
<source>Nome giocatore %num%</source>
- <target>Player name</target>
+ <target>Player name %num%</target>
</trans-unit>
<trans-unit id="8">
<source>Answer is OK!</source>
@@ -40,7 +40,11 @@
<source>The answer is WRONG!</source>
<target>Risposta SBAGLIATA!</target>
</trans-unit>
-
+ <trans-unit id="10">
+ <source>Next question</source>
+ <target>Domanda successiva </target>
+ </trans-unit>
+
</body>
</file>
</xliff>
\ No newline at end of file
Added:
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersFormFilter.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersFormFilter.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersFormFilter.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizAnswers form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizAnswersFormFilter extends BaseQuizAnswersFormFilter
+{
+}
Added:
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersTranslationFormFilter.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersTranslationFormFilter.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizAnswersTranslationFormFilter.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizAnswersTranslation form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizAnswersTranslationFormFilter extends
BaseQuizAnswersTranslationFormFilter
+{
+}
Added:
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsFormFilter.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsFormFilter.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsFormFilter.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizQuestions form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizQuestionsFormFilter extends
BaseQuizQuestionsFormFilter
+{
+}
Added:
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsTranslationFormFilter.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsTranslationFormFilter.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/filter/doctrine/PluginQuizQuestionsTranslationFormFilter.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizQuestionsTranslation form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizQuestionsTranslationFormFilter extends
BaseQuizQuestionsTranslationFormFilter
+{
+}
Added:
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersForm.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersForm.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersForm.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizAnswers form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage form
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormPluginTemplate.php 23810 2009-11-12
11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizAnswersForm extends BaseQuizAnswersForm
+{
+}
Added:
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersTranslationForm.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersTranslationForm.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizAnswersTranslationForm.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizAnswersTranslation form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage form
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormPluginTemplate.php 23810 2009-11-12
11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizAnswersTranslationForm extends
BaseQuizAnswersTranslationForm
+{
+}
Added:
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsForm.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsForm.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsForm.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizQuestions form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage form
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormPluginTemplate.php 23810 2009-11-12
11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizQuestionsForm extends BaseQuizQuestionsForm
+{
+}
Added:
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsTranslationForm.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsTranslationForm.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/form/doctrine/PluginQuizQuestionsTranslationForm.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginQuizQuestionsTranslation form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage form
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormPluginTemplate.php 23810 2009-11-12
11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginQuizQuestionsTranslationForm extends
BaseQuizQuestionsTranslationForm
+{
+}
Modified: plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
2010-01-28 23:20:37 UTC (rev 27294)
+++ plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -22,8 +22,8 @@
));
$this->widgetSchema->setLabels(array(
- 'numeroGiocatori' => 'Numero di giocatori',
- 'numeroDomandePerGiocatore' => 'Numero delle domande da fare a ciascun
giocatore'
+ 'numeroGiocatori' => 'Number of players',
+ 'numeroDomandePerGiocatore' => 'Number of questions to ask each player'
));
$this->widgetSchema['numeroGiocatori']->setAttribute('size', 3);
Modified: plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php
===================================================================
--- plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php 2010-01-28 23:20:37 UTC
(rev 27294)
+++ plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php 2010-01-28 23:38:37 UTC
(rev 27295)
@@ -227,11 +227,11 @@
public function setDomande()
{
- $domande =
Doctrine::getTable('QuizDomande')->inizializzaDomandeDaFare($this->getQuiz(),
$this->numGiocatori * $this->numDomPerGiocatore);
+ $domande =
Doctrine::getTable('QuizQuestions')->inizializzaDomandeDaFare($this->getQuiz(),
$this->numGiocatori * $this->numDomPerGiocatore);
foreach($domande as $domanda)
{
-
+
$this->domande[] = $domanda->id;
}
@@ -255,15 +255,15 @@
foreach ($this->getDomande() as $d => $domanda)
{
- $risposte =
Doctrine::getTable('QuizRisposte')->inizializzaRisposteDaFare($domanda, 5);
+ $risposte =
Doctrine::getTable('QuizAnswers')->inizializzaRisposteDaFare($domanda, 5);
foreach($risposte as $r => $risposta)
{
$this->risposte[$d][]= array(
- 'risposte_id' => $risposta->id,
- 'giusta' => $risposta->giusta
+ 'answers_id' => $risposta->id,
+ 'correct' => $risposta->giusta
);
//echo $risposta->Translation['it']->risposta;
@@ -276,12 +276,12 @@
{
$giocatore = $giocatore ? $giocatore : $this->numeroGiocatoreCorrente();
$domanda = $domanda ? $domanda : $this->numeroDomandaCorrente();
- $risposta_id = $this->risposte[$domanda][$risposta]['risposte_id'];
+ $risposta_id = $this->risposte[$domanda][$risposta]['answers_id'];
$this->risposteDate[$giocatore][$domanda] = array(
- 'risposta' => $risposta,
- 'risposta_id' => $risposta_id,
- 'giusta' => $this->rispostaGiusta($domanda, $risposta)
+ 'answer' => $risposta,
+ 'answers_id' => $risposta_id,
+ 'correct' => $this->rispostaGiusta($domanda, $risposta)
);
}
@@ -367,7 +367,7 @@
public function testoDomanda($dom)
{
$id = $this->domande[$dom];
- return Doctrine::getTable('QuizDomande')->testoDomanda($id);
+ return Doctrine::getTable('QuizQuestions')->testoDomanda($id);
}
/**
@@ -387,10 +387,10 @@
foreach($this->risposte[$dom] as $i => $risposta)
{
- $risp =
Doctrine::getTable('QuizRisposte')->testoRisposta($risposta['risposte_id']);
+ $risp =
Doctrine::getTable('QuizAnswers')->testoRisposta($risposta['answers_id']);
$r[$i] = array(
- 'testo' => $risp[0]->Translation['it']->risposta,
+ 'testo' => $risp[0]->Translation['it']->answer,
);
}
@@ -419,6 +419,7 @@
public function turnoSuccessivo()
{
$this->setChiaveDomandaCorrente($this->getChiaveDomandaCorrente()+1);
- return $this->getDomandaCorrente() < $this->numDomPerGiocatore()? true :
false;
+ //echo $this->getChiaveDomandaCorrente() . ' - '.
$this->numDomPerGiocatore();exit;
+ return $this->getChiaveDomandaCorrente() <= $this->numDomPerGiocatore()?
true : false;
}
}
Added: plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswers.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswers.class.php
(rev 0)
+++ plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswers.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * PluginQuizAnswers
+ *
+ * This class has been auto-generated by the Doctrine ORM Framework
+ *
+ * @package ##PACKAGE##
+ * @subpackage ##SUBPACKAGE##
+ * @author ##NAME## <##EMAIL##>
+ * @version SVN: $Id: Builder.php 6820 2009-11-30 17:27:49Z jwage $
+ */
+abstract class PluginQuizAnswers extends BaseQuizAnswers
+{
+
+}
\ No newline at end of file
Added:
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswersTable.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswersTable.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizAnswersTable.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,60 @@
+<?php
+/**
+ */
+class PluginQuizAnswersTable extends Doctrine_Table
+{
+ /**
+ * Inizializza le risposte.
+ * La procedura avviene domanda per domanda invece che tutte assieme
+ * in tal modo è possibile assegnare un numero di risposte diverso
+ * (necessario ad esempio per difficoltaCrescente)
+ *
+ * @param unknown_type $quiz_domande_id
+ * @param unknown_type $limit
+ * @return Doctrine_Collection
+ */
+ public function inizializzaRisposteDaFare($quiz_domande_id, $limit)
+ {
+
+ $q = Doctrine_Query::create()
+ ->select('r.id, r.correct')
+ ->from('QuizAnswers r')
+ ->where('r.quiz_answers_id = ? AND r.correct = 0', $quiz_domande_id)
+ ->orderBy('RAND()')
+ ;
+
+ if ($limit != null)
+ {
+ $q = $q->limit($limit);
+ }
+ $sbagliate = $q->execute();
+
+ $q = Doctrine_Query::create()
+ ->select('r.id, r.correct')
+ ->from('QuizAnswers r')
+ ->where('r.quiz_answers_id = ? AND r.correct = 1', $quiz_domande_id);
+
+ $giuste = $q->execute();
+ return $sbagliate->merge($giuste);
+
+ }
+
+ public function testoRisposta($id)
+ {
+ $q= Doctrine_Query::create()
+ ->select('r.id')
+ ->addSelect('rt.answer')
+ ->from('QuizAnswers r')
+ ->leftJoin('r.Translation rt')
+ ->where('r.id = ?', $id);
+
+ /*
+ foreach($risposte as $risposta)
+ {
+ $q->orWhere('r.id = '.$risposta['risposte_id']);
+ }
+ */
+
+ return $q->execute();
+ }
+}
\ No newline at end of file
Added:
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestions.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestions.class.php
(rev 0)
+++ plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestions.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * PluginQuizQuestions
+ *
+ * This class has been auto-generated by the Doctrine ORM Framework
+ *
+ * @package ##PACKAGE##
+ * @subpackage ##SUBPACKAGE##
+ * @author ##NAME## <##EMAIL##>
+ * @version SVN: $Id: Builder.php 6820 2009-11-30 17:27:49Z jwage $
+ */
+abstract class PluginQuizQuestions extends BaseQuizQuestions
+{
+
+}
\ No newline at end of file
Added:
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestionsTable.class.php
===================================================================
---
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestionsTable.class.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/lib/model/doctrine/PluginQuizQuestionsTable.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,39 @@
+<?php
+/**
+ */
+class PluginQuizQuestionsTable extends Doctrine_Table
+{
+/**
+ * @param int $numDomande Numero delle domande da fare
+ * @return Doctrine_Collection
+ */
+ public function inizializzaDomandeDaFare($quiz_id, $numDomande)
+ {
+
+ $q = Doctrine_Query::create()
+ ->select('d.id')
+ ->from('QuizQuestions d')
+ ->where('d.quiz_id = ? AND d.type_response = "single"', $quiz_id)
+ ->orderBy('rand()')
+ ->limit($numDomande);
+
+ return $q->execute();
+
+ }
+
+ /**
+ * @param int $id
+ * @return Doctrine_Collection
+ */
+ public function testoDomanda($id)
+ {
+
+ $q = Doctrine_Query::create()
+ ->select('d.id')
+ ->addSelect('dt.question')
+ ->from('QuizQuestions d')
+ ->leftJoin('d.Translation dt')
+ ->where('d.id = ?', $id);
+ return $q->execute();
+ }
+}
\ No newline at end of file
Modified:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
2010-01-28 23:20:37 UTC (rev 27294)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -92,12 +92,10 @@
}
$domanda = $this->quiz->testoDomandaCorrente();
- $this->domanda = $domanda[0]->Translation['it']->domanda;
+ $this->domanda = $domanda[0]->Translation['it']->question;
$this->risposte = $this->quiz->testiRisposteCorrenti();
-
-
if ($request->isMethod('post'))
{
// Memorizzo risposta
@@ -105,7 +103,7 @@
$this->quiz->setRispostaData($request->getParameter('risposta'));
if (!$this->quiz->turnoSuccessivo()) {$this->redirect('quiz-end-game');};
- echo 'La tua risposta è '.$request->getParameter('risposta').'. ';
+ // echo __('La tua risposta è %risposta%', array('%risposta%' =>
$request->getParameter('risposta'))).'. ';
if ($this->quiz->rispostaGiusta($this->quiz->getChiaveDomandaCorrente(),
$request->getParameter('risposta')))
{
Modified:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/components.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/components.class.php
2010-01-28 23:20:37 UTC (rev 27294)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/components.class.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -1,7 +1,7 @@
<?php
class sfQuizStartComponents extends sfComponents
{
- public function executeTabelloneGiocatore()
+ public function executeBoardPlayer()
{
$this->nome = $this->quiz->nomeGiocatoreCorrente();
$this->giocatore = $this->quiz->numeroGiocatoreCorrente()-1;
Added: plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_boardPlayer.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_boardPlayer.php
(rev 0)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_boardPlayer.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+Percorso giocatore <?php echo $nome?>
+
+<?php for ($d=1; $d<=$totDomande; $d++):?>
+<div>
+<?php echo $d.': ' ?>
+<?php if (isset($risposteDate[$giocatore+1][$d])):?>
+<?php echo $risposteDate[$giocatore+1][$d]['giusta'] ? __('Correct') :
__('Wrong') ?>
+<?php else: ?>
+<?php echo __('To respond') ?>
+
+<?php endif; ?>
+</div>
+<?php endfor;?>
Added:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_next_question.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_next_question.php
(rev 0)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/_next_question.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,3 @@
+<p>
+<input type="button" value="<?php echo __('Next question')?>"
onclick="location.href='<?php echo url_for('@quiz-game') ?>'">
+</p>
\ No newline at end of file
Added:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/correctAnswerSuccess.php
===================================================================
---
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/correctAnswerSuccess.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/correctAnswerSuccess.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,3 @@
+<?php echo __('Answer is OK!')?>
+
+<?php include_partial('next_question')?>
\ No newline at end of file
Added:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/endGameSuccess.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/endGameSuccess.php
(rev 0)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/endGameSuccess.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1 @@
+<?php echo __('The game is over')?>
\ No newline at end of file
Modified:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/gameSuccess.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/gameSuccess.php
2010-01-28 23:20:37 UTC (rev 27294)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/gameSuccess.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -1,6 +1,6 @@
<?php use_stylesheet('quizPlugin') ?>
-<div class="tabellone">
-<?php include_component('sfQuizStart', 'tabelloneGiocatore', array('quiz' =>
$quiz))?>
+<div class="board">
+<?php include_component('sfQuizStart', 'boardPlayer', array('quiz' => $quiz))?>
</div>
<h2>
Added:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/namesOfPlayersSuccess.php
===================================================================
---
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/namesOfPlayersSuccess.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/namesOfPlayersSuccess.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,13 @@
+
+<form method="post">
+
+<?php foreach ($form['newNomiGiocatori'] as $i => $nome): ?>
+ <div>
+ <?php echo $nome['nomeGiocatore']->renderLabel(__('Nome giocatore %num%',
array('%num%' => ($i+1)))) ?>
+ <?php echo $nome['nomeGiocatore']->render() ?>
+ <?php echo $nome['nomeGiocatore']->renderError() ?>
+ </div>
+<?php endforeach; ?>
+<?php echo $form->renderHiddenFields() ?>
+<input type="submit" value=">>">
+</form>
\ No newline at end of file
Added:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/wrongAnswerSuccess.php
===================================================================
---
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/wrongAnswerSuccess.php
(rev 0)
+++
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/wrongAnswerSuccess.php
2010-01-28 23:38:37 UTC (rev 27295)
@@ -0,0 +1,3 @@
+<?php echo __('The answer is WRONG!')?>
+
+<?php include_partial('next_question')?>
\ No newline at end of file
Modified: plugins/sfQuizPlugin/trunk/web/css/quizPlugin.css
===================================================================
--- plugins/sfQuizPlugin/trunk/web/css/quizPlugin.css 2010-01-28 23:20:37 UTC
(rev 27294)
+++ plugins/sfQuizPlugin/trunk/web/css/quizPlugin.css 2010-01-28 23:38:37 UTC
(rev 27295)
@@ -1,4 +1,4 @@
-.tabellone
+.board
{
color: red;
width: 200px;
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
