Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
framadate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nounous
framadate
Commits
e941cf18
Commit
e941cf18
authored
10 years ago
by
Olivier PEREZ
Browse files
Options
Downloads
Patches
Plain Diff
Add availability to edit a vote
parent
db915b0b
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/classes/Framadate/FramaDB.php
+5
-0
5 additions, 0 deletions
app/classes/Framadate/FramaDB.php
studs.php
+36
-2
36 additions, 2 deletions
studs.php
tpl/studs.tpl
+5
-6
5 additions, 6 deletions
tpl/studs.tpl
with
46 additions
and
8 deletions
app/classes/Framadate/FramaDB.php
+
5
−
0
View file @
e941cf18
...
@@ -85,4 +85,9 @@ class FramaDB
...
@@ -85,4 +85,9 @@ class FramaDB
return
$newVote
;
return
$newVote
;
}
}
function
updateVote
(
$poll_id
,
$vote_id
,
$choices
)
{
$prepared
=
$this
->
prepare
(
'UPDATE user_studs SET reponses = ? WHERE id_sondage = ? AND id_users = ?'
);
return
$prepared
->
execute
([
$choices
,
$poll_id
,
$vote_id
]);
}
}
}
This diff is collapsed.
Click to expand it.
studs.php
+
36
−
2
View file @
e941cf18
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
*/
use
Framadate\Services\PollService
;
use
Framadate\Services\PollService
;
use
Framadate\Utils
;
include_once
__DIR__
.
'/app/inc/init.php'
;
include_once
__DIR__
.
'/app/inc/init.php'
;
...
@@ -74,7 +75,7 @@ $pollService = new PollService($connect);
...
@@ -74,7 +75,7 @@ $pollService = new PollService($connect);
/* ---- */
/* ---- */
if
(
!
empty
(
$_GET
[
'poll'
]))
{
if
(
!
empty
(
$_GET
[
'poll'
]))
{
$poll_id
=
$
_GET
[
'poll'
]
;
$poll_id
=
filter_input
(
INPUT
_GET
,
'poll'
,
FILTER_VALIDATE_REGEXP
,
[
'options'
=>
[
'regexp'
=>
'/^[a-z0-9]+$/'
]])
;
}
}
...
@@ -86,11 +87,44 @@ if (!$poll) {
...
@@ -86,11 +87,44 @@ if (!$poll) {
exit
;
exit
;
}
}
// A vote is going to be edited
if
(
!
empty
(
$_POST
[
'edit_vote'
]))
{
// TODO Try what does filter_input with a wrong value
$editingVoteId
=
filter_input
(
INPUT_POST
,
'edit_vote'
,
FILTER_VALIDATE_INT
);
}
else
{
$editingVoteId
=
0
;
}
if
(
!
empty
(
$_POST
[
'save'
]))
{
// Save edition of an old vote
$editedVote
=
filter_input
(
INPUT_POST
,
'save'
,
FILTER_VALIDATE_INT
);
$newChoices
=
[];
// TODO Do this verification into a Service (maybe called 'InputService')
foreach
(
$_POST
[
'choices'
]
as
$id
=>
$choice
)
{
$choice
=
filter_var
(
$choice
,
FILTER_VALIDATE_REGEXP
,
[
'options'
=>
[
'regexp'
=>
'/^[012]$/'
]]);
if
(
$choice
!==
false
)
{
$newChoices
[
$id
]
=
$choice
;
}
}
if
(
count
(
$newChoices
)
==
count
(
$_POST
[
'choices'
]))
{
$result
=
$pollService
->
updatePoll
(
$poll_id
,
$editedVote
,
$newChoices
);
if
(
$result
)
{
$message
=
[
'type'
=>
'success'
,
'message'
=>
_
(
'Update vote successfully!'
)];
}
else
{
$message
=
[
'type'
=>
'success'
,
'message'
=>
_
(
'Update vote successfully!'
)];
}
}
}
elseif
(
isset
(
$_POST
[
''
]))
{
// Add a new vote
}
// Retrieve data
// Retrieve data
$slots
=
$pollService
->
allSlotsByPollId
(
$poll_id
);
$slots
=
$pollService
->
allSlotsByPollId
(
$poll_id
);
$votes
=
$pollService
->
allUserVotesByPollId
(
$poll_id
);
$votes
=
$pollService
->
allUserVotesByPollId
(
$poll_id
);
$comments
=
$pollService
->
allCommentsByPollId
(
$poll_id
);
$comments
=
$pollService
->
allCommentsByPollId
(
$poll_id
);
// Assign data to template
// Assign data to template
$smarty
->
assign
(
'poll_id'
,
$poll_id
);
$smarty
->
assign
(
'poll_id'
,
$poll_id
);
$smarty
->
assign
(
'poll'
,
$poll
);
$smarty
->
assign
(
'poll'
,
$poll
);
...
@@ -99,7 +133,7 @@ $smarty->assign('slots', split_slots($slots));
...
@@ -99,7 +133,7 @@ $smarty->assign('slots', split_slots($slots));
$smarty
->
assign
(
'votes'
,
split_votes
(
$votes
));
$smarty
->
assign
(
'votes'
,
split_votes
(
$votes
));
$smarty
->
assign
(
'best_moments'
,
computeBestMoments
(
$votes
));
$smarty
->
assign
(
'best_moments'
,
computeBestMoments
(
$votes
));
$smarty
->
assign
(
'comments'
,
$comments
);
$smarty
->
assign
(
'comments'
,
$comments
);
$smarty
->
assign
(
'editingVoteId'
,
0
);
// TODO Replace by the right ID
$smarty
->
assign
(
'editingVoteId'
,
$editingVoteId
);
//Utils::debug(computeBestMoments($votes));exit;
//Utils::debug(computeBestMoments($votes));exit;
...
...
This diff is collapsed.
Click to expand it.
tpl/studs.tpl
+
5
−
6
View file @
e941cf18
...
@@ -115,27 +115,27 @@
...
@@ -115,27 +115,27 @@
<td
class=
"bg-info"
headers=
"'.$td_headers[$k].'"
>
<td
class=
"bg-info"
headers=
"'.$td_headers[$k].'"
>
<ul
class=
"list-unstyled choice"
>
<ul
class=
"list-unstyled choice"
>
<li
class=
"yes"
>
<li
class=
"yes"
>
<input
type=
"radio"
id=
"y-choice-
{
$k
}
"
name=
"choice
{
$k
}
"
value=
"2"
{
if
$choice
==
2
}
checked
{/
if
}
/>
<input
type=
"radio"
id=
"y-choice-
{
$k
}
"
name=
"choice
s[
{
$k
}
]
"
value=
"2"
{
if
$choice
==
2
}
checked
{/
if
}
/>
<label
class=
"btn btn-default btn-xs"
for=
"y-choice-
{
$k
}
"
title=
"{_('Vote yes for ')} . $radio_title[$k] . '"
>
<label
class=
"btn btn-default btn-xs"
for=
"y-choice-
{
$k
}
"
title=
"{_('Vote yes for ')} . $radio_title[$k] . '"
>
<span
class=
"glyphicon glyphicon-ok"
></span><span
class=
"sr-only"
>
{_('Yes')}
</span>
<span
class=
"glyphicon glyphicon-ok"
></span><span
class=
"sr-only"
>
{_('Yes')}
</span>
</label>
</label>
</li>
</li>
<li
class=
"ifneedbe"
>
<li
class=
"ifneedbe"
>
<input
type=
"radio"
id=
"i-choice-
{
$k
}
"
name=
"choice
{
$k
}
"
value=
"1"
{
if
$choice
==
1
}
checked
{/
if
}
/>
<input
type=
"radio"
id=
"i-choice-
{
$k
}
"
name=
"choice
s[
{
$k
}
]
"
value=
"1"
{
if
$choice
==
1
}
checked
{/
if
}
/>
<label
class=
"btn btn-default btn-xs"
for=
"i-choice-
{
$k
}
"
title=
"{_('Vote ifneedbe for ')} . $radio_title[$k] . '"
>
<label
class=
"btn btn-default btn-xs"
for=
"i-choice-
{
$k
}
"
title=
"{_('Vote ifneedbe for ')} . $radio_title[$k] . '"
>
(
<span
class=
"glyphicon glyphicon-ok"
></span>
)
<span
class=
"sr-only"
>
{_('Ifneedbe')}
</span>
(
<span
class=
"glyphicon glyphicon-ok"
></span>
)
<span
class=
"sr-only"
>
{_('Ifneedbe')}
</span>
</label>
</label>
</li>
</li>
<li
class=
"no"
>
<li
class=
"no"
>
<input
type=
"radio"
id=
"n-choice-
{
$k
}
"
name=
"choice
{
$k
}
"
value=
"0"
{
if
$choice
==
0
}
checked
{/
if
}
/>
<input
type=
"radio"
id=
"n-choice-
{
$k
}
"
name=
"choice
s[
{
$k
}
]
"
value=
"0"
{
if
$choice
==
0
}
checked
{/
if
}
/>
<label
class=
"btn btn-default btn-xs"
for=
"n-choice-
{
$k
}
"
title=
"{_('Vote no for ')} . $radio_title[$k] . '"
>
<label
class=
"btn btn-default btn-xs"
for=
"n-choice-
{
$k
}
"
title=
"{_('Vote no for ')} . $radio_title[$k] . '"
>
<span
class=
"glyphicon glyphicon-ban-circle"
></span><span
class=
"sr-only"
>
{_('No')}
</span>
<span
class=
"glyphicon glyphicon-ban-circle"
></span><span
class=
"sr-only"
>
{_('No')}
</span>
</label>
</label>
</li>
</li>
</ul>
</ul>
</td>
</td>
<td></td>
{/
foreach
}
{/
foreach
}
<td
style=
"padding:5px"
><button
type=
"submit"
class=
"btn btn-success btn-xs"
name=
"save"
value=
"
{
$vote
->
id
}
"
title=
"{_('Save the choices')}
{
$vote
->
name
}
"
>
{_('Save')}
</button></td>
{
else
}
{
else
}
{* Voted line *}
{* Voted line *}
...
@@ -154,8 +154,7 @@
...
@@ -154,8 +154,7 @@
{
if
$poll
->
active
&&
$poll
->
editable
}
{
if
$poll
->
active
&&
$poll
->
editable
}
<td>
<td>
<input
type=
"hidden"
name=
"edit_vote"
value=
"
{
$vote
->
id
}
"
/>
<button
type=
"submit"
class=
"btn btn-link btn-sm"
name=
"edit_vote"
value=
"
{
$vote
->
id
}
"
title=
"{_('Edit the line:')}
{
$vote
->
name
}
"
>
<button
type=
"submit"
class=
"btn btn-link btn-sm"
name=
"edit_vote"
title=
"{_('Edit the line:')}
{
$vote
->
name
}
"
>
<span
class=
"glyphicon glyphicon-pencil"
></span><span
class=
"sr-only"
>
{_('Edit')}
</span>
<span
class=
"glyphicon glyphicon-pencil"
></span><span
class=
"sr-only"
>
{_('Edit')}
</span>
</button>
</button>
</td>
</td>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment