Compare commits
2 commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
a95facc42b | ||
![]() |
292faf59eb |
10 changed files with 185 additions and 29 deletions
|
@ -4,7 +4,6 @@ namespace App;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Test;
|
||||
|
||||
class Group extends Model
|
||||
{
|
||||
|
@ -34,21 +33,15 @@ class Group extends Model
|
|||
{
|
||||
$this->name = $request["name"];
|
||||
$this->save();
|
||||
return true;
|
||||
}
|
||||
|
||||
public function updateGroup($request)
|
||||
{
|
||||
$this->update($request);
|
||||
return true;
|
||||
}
|
||||
|
||||
public function deleteGroup()
|
||||
{
|
||||
if (Auth::user()->isAdministrator()) {
|
||||
$this->delete();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
$this->delete();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,7 +14,6 @@ class Option extends Model
|
|||
public function deleteOption()
|
||||
{
|
||||
$this->delete();
|
||||
return true;
|
||||
}
|
||||
|
||||
public function addOption($question, $optionData)
|
||||
|
|
|
@ -18,14 +18,6 @@ class Question extends Model
|
|||
return $this->belongsTo(Test::class);
|
||||
}
|
||||
|
||||
public function isCorrect($user_answer)
|
||||
{
|
||||
if ($user_answer == $this->answer_id) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function deleteQuestion()
|
||||
{
|
||||
$options = $this->options;
|
||||
|
@ -33,7 +25,6 @@ class Question extends Model
|
|||
$option->deleteOption();
|
||||
}
|
||||
$this->delete();
|
||||
return true;
|
||||
}
|
||||
|
||||
public function addQuestion($test, $request)
|
||||
|
@ -77,20 +68,20 @@ class Question extends Model
|
|||
$this->multiple_answers_question = $request->multiple_answers_question;
|
||||
$this->question_type = "checkbox";
|
||||
$correct_answers = 0;
|
||||
if ($request->correct_answer1 == 1) {
|
||||
if ($request->correct_answer1 === 1) {
|
||||
$correct_answers++;
|
||||
}
|
||||
if ($request->correct_answer2 == 1) {
|
||||
if ($request->correct_answer2 === 1) {
|
||||
$correct_answers++;
|
||||
}
|
||||
if ($request->correct_answer3 == 1) {
|
||||
if ($request->correct_answer3 === 1) {
|
||||
$correct_answers++;
|
||||
}
|
||||
if ($request->correct_answer4 == 1) {
|
||||
if ($request->correct_answer4 === 1) {
|
||||
$correct_answers++;
|
||||
}
|
||||
$this->correct_answers = $correct_answers;
|
||||
}
|
||||
$this->update();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,8 +5,6 @@ namespace App;
|
|||
use Illuminate\Notifications\Notifiable;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use App\Group;
|
||||
use App\Testdetail;
|
||||
|
||||
class User extends Authenticatable
|
||||
{
|
||||
|
@ -280,4 +278,4 @@ class User extends Authenticatable
|
|||
return "admin";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -56,8 +56,8 @@ return [
|
|||
*/
|
||||
|
||||
'from' => [
|
||||
'address' => 'elearning@mwalbeck.org',
|
||||
'name' => 'Elearning',
|
||||
'address' => '',
|
||||
'name' => '',
|
||||
],
|
||||
|
||||
/*
|
||||
|
|
|
@ -8,7 +8,7 @@ Currently there is no documentation for this project (But I'm slowly working on
|
|||
|
||||
Though if you want to play around with it you just need to clone the repo, get composer and run the composer install and you're good to go.
|
||||
|
||||
I'm developing this project in PHP 7 (should work with 5.6) and using MariaDB for the database, but it should work with most databases.
|
||||
I'm developing this project in PHP 7 and using MariaDB for the database, but it should work with most databases.
|
||||
|
||||
The laravel version is 5.3.
|
||||
|
||||
|
|
19
resources/lang/da/auth.php
Normal file
19
resources/lang/da/auth.php
Normal file
|
@ -0,0 +1,19 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Authentication Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are used during authentication for various
|
||||
| messages that we need to display to the user. You are free to modify
|
||||
| these language lines according to your application's requirements.
|
||||
|
|
||||
*/
|
||||
|
||||
'failed' => 'Dit brugernavn og/eller kodeord er forkert.',
|
||||
'throttle' => 'For mange log ind forsøg. Prøv venligst igen om :seconds sekunder.',
|
||||
|
||||
];
|
19
resources/lang/da/pagination.php
Normal file
19
resources/lang/da/pagination.php
Normal file
|
@ -0,0 +1,19 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Pagination Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are used by the paginator library to build
|
||||
| the simple pagination links. You are free to change them to anything
|
||||
| you want to customize your views to better match your application.
|
||||
|
|
||||
*/
|
||||
|
||||
'previous' => '« Forrige',
|
||||
'next' => 'Næste »',
|
||||
|
||||
];
|
22
resources/lang/da/passwords.php
Normal file
22
resources/lang/da/passwords.php
Normal file
|
@ -0,0 +1,22 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reset Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are the default lines which match reasons
|
||||
| that are given by the password broker for a password update attempt
|
||||
| has failed, such as for an invalid token or invalid new password.
|
||||
|
|
||||
*/
|
||||
|
||||
'password' => 'Dit kodeord skal være minimum 8 tegn og begge felter skal være ens.',
|
||||
'reset' => 'Dit kodeord er blevet nulstillet!',
|
||||
'sent' => 'Vi har sendt en mail til dig med et link til nulstilling af dit kodeord',
|
||||
'token' => 'Dit link til nulstilling af kodeord er ugyldigt.',
|
||||
'user' => "Vi kan ikke finde en bruger med den e-mail adresse.",
|
||||
|
||||
];
|
115
resources/lang/da/validation.php
Normal file
115
resources/lang/da/validation.php
Normal file
|
@ -0,0 +1,115 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Validation Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines contain the default error messages used by
|
||||
| the validator class. Some of these rules have multiple versions such
|
||||
| as the size rules. Feel free to tweak each of these messages here.
|
||||
|
|
||||
*/
|
||||
|
||||
'accepted' => 'The :attribute must be accepted.',
|
||||
'active_url' => 'The :attribute is not a valid URL.',
|
||||
'after' => 'The :attribute must be a date after :date.',
|
||||
'alpha' => 'The :attribute may only contain letters.',
|
||||
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
|
||||
'alpha_num' => 'The :attribute may only contain letters and numbers.',
|
||||
'array' => 'The :attribute must be an array.',
|
||||
'before' => 'The :attribute must be a date before :date.',
|
||||
'between' => [
|
||||
'numeric' => 'The :attribute must be between :min and :max.',
|
||||
'file' => 'The :attribute must be between :min and :max kilobytes.',
|
||||
'string' => 'The :attribute must be between :min and :max characters.',
|
||||
'array' => 'The :attribute must have between :min and :max items.',
|
||||
],
|
||||
'boolean' => 'The :attribute field must be true or false.',
|
||||
'confirmed' => 'The :attribute confirmation does not match.',
|
||||
'date' => 'The :attribute is not a valid date.',
|
||||
'date_format' => 'The :attribute does not match the format :format.',
|
||||
'different' => 'The :attribute and :other must be different.',
|
||||
'digits' => 'The :attribute must be :digits digits.',
|
||||
'digits_between' => 'The :attribute must be between :min and :max digits.',
|
||||
'dimensions' => 'The :attribute has invalid image dimensions.',
|
||||
'distinct' => 'The :attribute field has a duplicate value.',
|
||||
'email' => 'The :attribute must be a valid email address.',
|
||||
'exists' => 'The selected :attribute is invalid.',
|
||||
'file' => 'The :attribute must be a file.',
|
||||
'filled' => 'The :attribute field is required.',
|
||||
'image' => 'The :attribute must be an image.',
|
||||
'in' => 'The selected :attribute is invalid.',
|
||||
'in_array' => 'The :attribute field does not exist in :other.',
|
||||
'integer' => 'The :attribute must be an integer.',
|
||||
'ip' => 'The :attribute must be a valid IP address.',
|
||||
'json' => 'The :attribute must be a valid JSON string.',
|
||||
'max' => [
|
||||
'numeric' => 'The :attribute may not be greater than :max.',
|
||||
'file' => 'The :attribute may not be greater than :max kilobytes.',
|
||||
'string' => 'The :attribute may not be greater than :max characters.',
|
||||
'array' => 'The :attribute may not have more than :max items.',
|
||||
],
|
||||
'mimes' => 'The :attribute must be a file of type: :values.',
|
||||
'min' => [
|
||||
'numeric' => 'The :attribute must be at least :min.',
|
||||
'file' => 'The :attribute must be at least :min kilobytes.',
|
||||
'string' => 'The :attribute must be at least :min characters.',
|
||||
'array' => 'The :attribute must have at least :min items.',
|
||||
],
|
||||
'not_in' => 'The selected :attribute is invalid.',
|
||||
'numeric' => 'The :attribute must be a number.',
|
||||
'present' => 'The :attribute field must be present.',
|
||||
'regex' => 'The :attribute format is invalid.',
|
||||
'required' => 'The :attribute field is required.',
|
||||
'required_if' => 'The :attribute field is required when :other is :value.',
|
||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
||||
'required_with' => 'The :attribute field is required when :values is present.',
|
||||
'required_with_all' => 'The :attribute field is required when :values is present.',
|
||||
'required_without' => 'The :attribute field is required when :values is not present.',
|
||||
'required_without_all' => 'The :attribute field is required when none of :values are present.',
|
||||
'same' => 'The :attribute and :other must match.',
|
||||
'size' => [
|
||||
'numeric' => 'The :attribute must be :size.',
|
||||
'file' => 'The :attribute must be :size kilobytes.',
|
||||
'string' => 'The :attribute must be :size characters.',
|
||||
'array' => 'The :attribute must contain :size items.',
|
||||
],
|
||||
'string' => 'The :attribute must be a string.',
|
||||
'timezone' => 'The :attribute must be a valid zone.',
|
||||
'unique' => 'The :attribute has already been taken.',
|
||||
'url' => 'The :attribute format is invalid.',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Custom Validation Language Lines
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here you may specify custom validation messages for attributes using the
|
||||
| convention "attribute.rule" to name the lines. This makes it quick to
|
||||
| specify a specific custom language line for a given attribute rule.
|
||||
|
|
||||
*/
|
||||
|
||||
'custom' => [
|
||||
'attribute-name' => [
|
||||
'rule-name' => 'custom-message',
|
||||
],
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Custom Validation Attributes
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| The following language lines are used to swap attribute place-holders
|
||||
| with something more reader friendly such as E-Mail Address instead
|
||||
| of "email". This simply helps us make messages a little cleaner.
|
||||
|
|
||||
*/
|
||||
|
||||
'attributes' => [],
|
||||
|
||||
];
|
Reference in a new issue