Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Pixel Humain
survey
Commits
783160c8
Commit
783160c8
authored
Mar 18, 2020
by
Raph El
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hotfix divers quand il n'y a pas de answers
parent
cd26548f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
115 additions
and
102 deletions
+115
-102
controllers/answer/IndexAction.php
controllers/answer/IndexAction.php
+3
-3
models/Answer.php
models/Answer.php
+1
-0
models/Form.php
models/Form.php
+105
-98
views/tpls/forms/cplx/financementFromBudget.php
views/tpls/forms/cplx/financementFromBudget.php
+6
-1
No files found.
controllers/answer/IndexAction.php
View file @
783160c8
...
...
@@ -25,12 +25,12 @@ class IndexAction extends CAction
$answer
=
PHDB
::
findOne
(
Form
::
ANSWER_COLLECTION
,
array
(
"_id"
=>
new
MongoId
(
$id
)));
}
}
//Rest::json($params); exit;
$params
=
Form
::
getDataForAnswer
(
$params
);
$params
[
"answer"
]
=
$answer
;
// TODO améliorer getdataForAnser pour soit viré la création de lanswers soit charger la bonne answer
$params
[
"answer"
]
=
$answer
;
$form
=
PHDB
::
findOne
(
Form
::
COLLECTION
,
array
(
"id"
=>
$answer
[
"formId"
]));
$parentForm
=
Slug
::
getElementBySlug
(
$form
[
"id"
]);
...
...
models/Answer.php
View file @
783160c8
...
...
@@ -12,6 +12,7 @@ class Answer{
public
static
function
generateAnswer
(){
$costum
=
CacheHelper
::
getCostum
();
//Rest::json($costum); exit;
$ans
=
[
"user"
=>
Yii
::
app
()
->
session
[
"userId"
],
"links"
=>
[
...
...
models/Form.php
View file @
783160c8
...
...
@@ -649,6 +649,7 @@ class Form {
}
public
static
function
getFormData
(
$params
){
$costum
=
CacheHelper
::
getCostum
();
//Rest::json($costum ); exit;
//WARNING la c'est bien data que l'on veut
if
(
isset
(
$costum
[
"form"
][
"rules"
])){
foreach
(
$params
[
"formList"
]
as
$k
=>
$value
)
{
...
...
@@ -663,22 +664,24 @@ class Form {
$budgetInputList
=
[];
$allforms
=
[];
$stockBudgetInputs
=
false
;
foreach
(
$params
[
"formList"
]
as
$i
=>
$formId
)
{
$f
=
PHDB
::
findOne
(
Form
::
COLLECTION
,
[
"id"
=>
$formId
]);
$allforms
[
$formId
]
=
$f
;
foreach
(
$f
[
"inputs"
]
as
$key
=>
$inp
)
{
if
(
in_array
(
$inp
[
"type"
],
[
"tpls.forms.cplx.budget"
]
)
)
$budgetInputList
[
$formId
.
"."
.
$key
]
=
$formId
.
"."
.
$key
;
if
(
in_array
(
$inp
[
"type"
],
[
"tpls.forms.cplx.tpls.forms.cplx.financementFromBudget"
,
"tpls.forms.cplx.tpls.forms.cplx.suiviFromBudget"
,
"tpls.forms.cplx.tpls.forms.cplx.decideFromBudget"
]
)
)
$stockBudgetInputs
=
true
;
}
}
if
(
!
empty
(
$params
[
"formList"
])
){
foreach
(
$params
[
"formList"
]
as
$i
=>
$formId
)
{
$f
=
PHDB
::
findOne
(
Form
::
COLLECTION
,
[
"id"
=>
$formId
]);
$allforms
[
$formId
]
=
$f
;
foreach
(
$f
[
"inputs"
]
as
$key
=>
$inp
)
{
if
(
in_array
(
$inp
[
"type"
],
[
"tpls.forms.cplx.budget"
]
)
)
$budgetInputList
[
$formId
.
"."
.
$key
]
=
$formId
.
"."
.
$key
;
if
(
in_array
(
$inp
[
"type"
],
[
"tpls.forms.cplx.tpls.forms.cplx.financementFromBudget"
,
"tpls.forms.cplx.tpls.forms.cplx.suiviFromBudget"
,
"tpls.forms.cplx.tpls.forms.cplx.decideFromBudget"
]
)
)
$stockBudgetInputs
=
true
;
}
}
}
if
(
count
(
$budgetInputList
))
Yii
::
app
()
->
session
[
"budgetInputList"
]
=
$budgetInputList
;
...
...
@@ -727,6 +730,7 @@ class Form {
$params
[
"formList"
]
=
$costum
[
"form"
][
"ids"
];
$params
[
"formId"
]
=
implode
(
"|"
,
$params
[
"formList"
]);
}
//Rest::json($params); exit;
$params
=
self
::
getFormData
(
$params
);
}
else
{
if
(
isset
(
$_GET
[
"form"
]))
...
...
@@ -743,91 +747,94 @@ class Form {
$showForm
=
true
;
$myAnswers
=
self
::
getListAnswersBy
(
$params
[
"formId"
],
$params
[
"el"
][
"slug"
],
Yii
::
app
()
->
session
[
"userId"
]);
if
(
!
empty
(
$params
[
"formId"
])
)
$myAnswers
=
self
::
getListAnswersBy
(
$params
[
"formId"
],
$params
[
"el"
][
"slug"
],
Yii
::
app
()
->
session
[
"userId"
]);
if
(
!
isset
(
$costum
[
"form"
][
"oneAnswerPerPerson"
])
||
count
(
$myAnswers
)
==
0
){
//si ya qu'une réponse et on la charge directe
if
(
count
(
$myAnswers
)
==
1
)
$answer
=
$myAnswers
[
array_keys
(
$myAnswers
)[
0
]
];
else
{
//sinon on cherche la reponse incomplete
foreach
(
$myAnswers
as
$id
=>
$ans
)
{
//chercher les reponse incomplete
if
(
!
isset
(
$ans
[
"answers"
])
&&
$answer
==
null
)
$answer
=
$ans
;
}
}
if
(
$answer
==
null
&&
count
(
$myAnswers
)
>
1
&&
!
$params
[
"canEdit"
]
)
$showForm
=
false
;
//si aucune reponse existe
//et qu'on a des input complexe alors on génere une answer
// if( !isset($_GET['answer']) && $answer == null ){
// if(isset($params["formList"])){
// $generateAnswer = true;
// }
// else if(isset($form["inputs"])){
// foreach ($form["inputs"] as $key => $inp)
// {
// if( stripos( $inp["type"] , "tpls.forms.cplx" ) !== false )
// $generateAnswer = true;
// }
// }
// }
// if( isset($answerId) && $answerId == "new" )
// $generateAnswer = true;
//on pré genere un anwser que quand il n'y en pas
//pour permettre le save onBlur , ou s'il y a des cplx forms
//il ne peut y avoir qu'un seul answer en cours simultanement
//on pré genere un anwser que quand il n'y en pas
//pour permettre le save onBlur , ou s'il y a des cplx forms
//il ne peut y avoir qu'un seul answer en cours simultanement
///TODO purger ANSwers via CRON
// if( $generateAnswer )
// {
// //var_dump("create new" );
// $ans = [
// "formId" => $params["formId"],
// "user" => Yii::app()->session["userId"],
// "parentSlug" => $params["el"]["slug"],
// "links"=>[
// "answered" => [ Yii::app()->session["userId"] ] ,
// //proposed ,particpated,decision,financed,financed,referenced,commented,worked,payed,tested,validated
// //each actor is connectable to his activitystream
// ],
// "created" => time()
// ];
// if(isset($params["formList"]))
// $ans["formList"] = count($params["formList"]);
// PHDB::insert(Form::ANSWER_COLLECTION, $ans);
// $answer = PHDB::findOne( Form::ANSWER_COLLECTION, [ "_id" => new MongoId($ans["_id"]) ] );
// }
// var_dump($params["el"]["slug"] );
// var_dump($params["formId"] );
// var_dump($answer );
// var_dump(Yii::app()->getRequest()->getQuery('answer'));
// exit;
$params
[
"answer"
]
=
$answer
;
$params
[
"showForm"
]
=
$showForm
;
$params
[
"showAnswerActions"
]
=
(
isset
(
$params
[
"showAnswerActions"
]))
?
$params
[
"showAnswerActions"
]
:
true
;
$allAnswers
=
self
::
getListAnswersBy
(
$params
[
"formId"
],
$params
[
"el"
][
"slug"
]
)
;
$params
[
"allAnswers"
]
=
(
!
isset
(
$allAnswers
))
?
[]
:
$allAnswers
;
//var_dump($params["el"]["slug"]);exit;
//var_dump($params["allAnswers"]);exit;
}
else
{
echo
"<h4 class='text-center text-red'><i class='fa fa-warning'></i> Une seul réponse n'est possible.</h4>"
;
echo
"<a class='btn btn-primary' href='/costum/co/index/slug/"
.
$el
[
"slug"
]
.
"/answer/"
.
$myAnswers
[
0
]
.
"'>Votre réponse</a>"
;
}
if
(
!
empty
(
$myAnswers
)
)
{
if
(
!
isset
(
$costum
[
"form"
][
"oneAnswerPerPerson"
])
||
count
(
$myAnswers
)
==
0
)
{
//si ya qu'une réponse et on la charge directe
if
(
count
(
$myAnswers
)
==
1
)
$answer
=
$myAnswers
[
array_keys
(
$myAnswers
)[
0
]
];
else
{
//sinon on cherche la reponse incomplete
foreach
(
$myAnswers
as
$id
=>
$ans
)
{
//chercher les reponse incomplete
if
(
!
isset
(
$ans
[
"answers"
])
&&
$answer
==
null
)
$answer
=
$ans
;
}
}
if
(
$answer
==
null
&&
count
(
$myAnswers
)
>
1
&&
!
$params
[
"canEdit"
]
)
$showForm
=
false
;
//si aucune reponse existe
//et qu'on a des input complexe alors on génere une answer
// if( !isset($_GET['answer']) && $answer == null ){
// if(isset($params["formList"])){
// $generateAnswer = true;
// }
// else if(isset($form["inputs"])){
// foreach ($form["inputs"] as $key => $inp)
// {
// if( stripos( $inp["type"] , "tpls.forms.cplx" ) !== false )
// $generateAnswer = true;
// }
// }
// }
// if( isset($answerId) && $answerId == "new" )
// $generateAnswer = true;
//on pré genere un anwser que quand il n'y en pas
//pour permettre le save onBlur , ou s'il y a des cplx forms
//il ne peut y avoir qu'un seul answer en cours simultanement
//on pré genere un anwser que quand il n'y en pas
//pour permettre le save onBlur , ou s'il y a des cplx forms
//il ne peut y avoir qu'un seul answer en cours simultanement
///TODO purger ANSwers via CRON
// if( $generateAnswer )
// {
// //var_dump("create new" );
// $ans = [
// "formId" => $params["formId"],
// "user" => Yii::app()->session["userId"],
// "parentSlug" => $params["el"]["slug"],
// "links"=>[
// "answered" => [ Yii::app()->session["userId"] ] ,
// //proposed ,particpated,decision,financed,financed,referenced,commented,worked,payed,tested,validated
// //each actor is connectable to his activitystream
// ],
// "created" => time()
// ];
// if(isset($params["formList"]))
// $ans["formList"] = count($params["formList"]);
// PHDB::insert(Form::ANSWER_COLLECTION, $ans);
// $answer = PHDB::findOne( Form::ANSWER_COLLECTION, [ "_id" => new MongoId($ans["_id"]) ] );
// }
// var_dump($params["el"]["slug"] );
// var_dump($params["formId"] );
// var_dump($answer );
// var_dump(Yii::app()->getRequest()->getQuery('answer'));
// exit;
$params
[
"answer"
]
=
$answer
;
$params
[
"showForm"
]
=
$showForm
;
$params
[
"showAnswerActions"
]
=
(
isset
(
$params
[
"showAnswerActions"
]))
?
$params
[
"showAnswerActions"
]
:
true
;
$allAnswers
=
self
::
getListAnswersBy
(
$params
[
"formId"
],
$params
[
"el"
][
"slug"
]
)
;
$params
[
"allAnswers"
]
=
(
!
isset
(
$allAnswers
))
?
[]
:
$allAnswers
;
//var_dump($params["el"]["slug"]);exit;
//var_dump($params["allAnswers"]);exit;
}
else
{
echo
"<h4 class='text-center text-red'><i class='fa fa-warning'></i> Une seul réponse n'est possible.</h4>"
;
echo
"<a class='btn btn-primary' href='/costum/co/index/slug/"
.
$el
[
"slug"
]
.
"/answer/"
.
$myAnswers
[
0
]
.
"'>Votre réponse</a>"
;
}
}
}
return
$params
;
}
...
...
views/tpls/forms/cplx/financementFromBudget.php
View file @
783160c8
...
...
@@ -54,7 +54,12 @@ $organizations = Link::groupFindByType( Organization::COLLECTION,$communityLinks
$orgs
=
[];
foreach
(
$organizations
as
$id
=>
$or
)
{
$roles
=
$or
[
"links"
][
"memberOf"
][
$this
->
costum
[
"contextId"
]][
"roles"
];
$roles
=
null
;
if
(
!
empty
(
$or
[
"links"
])
&&
!
empty
(
$or
[
"links"
][
"memberOf"
])
&&
!
empty
(
$or
[
"links"
][
"memberOf"
][
$this
->
costum
[
"contextId"
]])
&&
!
empty
(
$or
[
"links"
][
"memberOf"
][
$this
->
costum
[
"contextId"
]][
"roles"
])
)
$roles
=
$or
[
"links"
][
"memberOf"
][
$this
->
costum
[
"contextId"
]][
"roles"
];
if
(
$paramsData
[
"limitRoles"
]
&&
!
empty
(
$roles
))
{
foreach
(
$roles
as
$i
=>
$r
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment