Implement Single Transferable Voting #708
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| <?php | ||
|
|
||
| namespace App\Http\Controllers\StudentsCouncil; | ||
|
|
||
| use Illuminate\Http\Request; | ||
| use Carbon\Carbon; | ||
| use App\Http\Controllers\Controller; | ||
| use Illuminate\Support\Facades\Validator; | ||
| use Illuminate\Support\Facades\DB; | ||
| use Maatwebsite\Excel\Facades\Excel; | ||
| use Illuminate\Validation\Rule; | ||
| use App\Models\AnonymousQuestions\AnswerSheet; | ||
| use App\Models\Semester; | ||
| use App\Models\Question; | ||
| use App\Models\QuestionOption; | ||
| use App\Models\GeneralAssemblies\GeneralAssembly; | ||
| use App\Utils\HasPeriodicEvent; | ||
| use App\Exports\UsersSheets\AnonymousQuestionsExport; | ||
|
|
||
| /** | ||
| * Controls actions related to anonymous questions or general assembly polls. | ||
| */ | ||
| class QuestionController extends Controller | ||
| { | ||
| /** | ||
| * Saves a new question. | ||
| */ | ||
| protected function createQuestion(Request $request, Semester|GeneralAssembly $parent = null): Question | ||
| { | ||
| $validatedData = $request->validate([ | ||
| 'title' => 'required|string', | ||
| 'question_type' => [ | ||
| 'required', | ||
| Rule::in(Question::QUESTION_TYPES) | ||
| ], | ||
| 'max_options' => ['required', 'min:1', Rule::excludeIf($request['question_type'] == QUESTION::TEXT_ANSWER), 'integer'], | ||
| 'options' => ['required', 'min:1', Rule::excludeIf($request['question_type'] != QUESTION::SELECTION && $request['question_type'] != QUESTION::RANKING), 'array'], | ||
| 'options.*' => ['required', 'min:1', 'max:255', Rule::excludeIf($request['question_type'] != QUESTION::SELECTION && $request['question_type'] != QUESTION::RANKING), 'string'], | ||
| ]); | ||
| if ($validatedData['question_type'] == Question::SELECTION || $validatedData['question_type'] == Question::RANKING) { | ||
| $options = array_filter($validatedData['options'], function ($s) { | ||
| return $s != null; | ||
| }); | ||
| if (count($options) == 0) { | ||
| $validator->after(function ($validator) { | ||
| $validator->errors()->add('options', __('voting.at_least_one_option')); | ||
| }); | ||
| } | ||
| } | ||
|
Comment on lines
+28
to
+49
There was a problem hiding this comment. Potential reference to undefined - $validatedData = $request->validate([
- ...
- ]);
- ...
- if (count($options) == 0) {
- $validator->after(function ($validator) {
- ...
- });
- }
+ $validator = Validator::make($request->all(), [
+ ...
+ ]);
+ $validatedData = $validator->validate();
+ if (count($options) == 0) {
+ $validator->after(function ($validator) {
+ ...
+ });
+ }
|
||
| $question = $parent->questions()->create([ | ||
| 'title' => $validatedData['title'], | ||
| 'max_options' => isset($validatedData['max_options']) ? $validatedData['max_options'] : null, | ||
| 'question_type' => $validatedData['question_type'], | ||
| ]); | ||
| if ($validatedData['question_type'] == Question::SELECTION || $validatedData['question_type'] == Question::RANKING) { | ||
| foreach ($options as $option) { | ||
| $question->options()->create([ | ||
| 'title' => $option, | ||
| 'votes' => 0 | ||
| ]); | ||
| } | ||
| } | ||
| return $question; | ||
| } | ||
|
|
||
| protected function saveVoteForQuestion(Question $question, $validatedData, ?AnswerSheet $answerSheet = null) | ||
| { | ||
| // validation ensures we have answers | ||
| // to all of these questions | ||
| $answer = $validatedData[$question->formKey()]; | ||
| if ($question->question_type == Question::TEXT_ANSWER || | ||
| $question->question_type == Question::RANKING) { | ||
| $question->storeAnswers(user(), $answer, $answerSheet); | ||
| } elseif ($question->question_type == Question::SELECTION) { | ||
| if ($question->isMultipleChoice()) { | ||
| $options = array_map( | ||
| function (int $id) {return QuestionOption::find($id);}, | ||
| $answer | ||
| ); | ||
| $question->storeAnswers(user(), $options, $answerSheet); | ||
| } else { | ||
| $option = QuestionOption::find($answer); | ||
| $question->storeAnswers(user(), $option, $answerSheet); | ||
| } | ||
| } else { | ||
| throw new \Exception("Unknown question type"); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably irrrelevant with
scopeBindings()as that ensurers the question is the child of the specified general assembly.