This commit is contained in:
@@ -17,6 +17,7 @@ class TlaController extends Controller
|
||||
$session->forget('tla-'.$language);
|
||||
$session->forget('correct-'.$language);
|
||||
$session->forget('review-'.$language);
|
||||
$session->put('tla-array-'.$language, ['', '', '']);
|
||||
$session->put('date-'.$language, date('Y-m-d'));
|
||||
}
|
||||
}
|
||||
@@ -27,6 +28,9 @@ class TlaController extends Controller
|
||||
if ( !in_array($language, $allowedLanguages) ) $language = 'en';
|
||||
|
||||
$tla = Tla::GetCurrentTla($language);
|
||||
|
||||
if ($tla == NULL) return response()->json([ 'no_tla' => true ]);
|
||||
|
||||
$this->session_flush($request, $language);
|
||||
|
||||
$session = $request->session();
|
||||
@@ -39,6 +43,7 @@ class TlaController extends Controller
|
||||
'context' => $session->get('tla-'.$language) == $tla->acronym ? $tla->context : NULL,
|
||||
'submitter' => $tla->submitter,
|
||||
'correct' => $session->get('correct-'.$language),
|
||||
'tla_array' => ['','',''],
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -96,6 +101,14 @@ class TlaController extends Controller
|
||||
if ($score == 12) $session->put('correct-'.$language, true);
|
||||
}
|
||||
|
||||
$tla_array = $session->get('tla-array-'.$language);
|
||||
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
if ($tla_array[$i] == "" && $guess_array[$i + 3] == 2) $tla_array[$i] = $tla[$i];
|
||||
}
|
||||
|
||||
$session->put('tla-array-'.$language, $tla_array);
|
||||
|
||||
return response()->json([
|
||||
'guesses' => $guesses,
|
||||
'date' => $session->get('date'),
|
||||
@@ -103,6 +116,7 @@ class TlaController extends Controller
|
||||
'context' => $session->get('tla-'.$language) == $tla_object->acronym ? $tla_object->context : NULL,
|
||||
'score' => $score,
|
||||
'correct' => $session->get('correct-'.$language),
|
||||
'tla_array' => $tla_array,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -13,7 +13,7 @@ class Tla extends Model
|
||||
|
||||
protected $fillable = ['acronym', 'hint', 'language', 'used', 'context', 'submitter', 'likes', 'dislikes'];
|
||||
|
||||
public static function GetCurrentTla( string $language ) : Tla {
|
||||
public static function GetCurrentTla( string $language ) {
|
||||
$tla = Tla::where('used', date("Y-m-d"))
|
||||
->where('language', $language)
|
||||
->first();
|
||||
@@ -24,6 +24,8 @@ class Tla extends Model
|
||||
->inRandomOrder()
|
||||
->first();
|
||||
|
||||
if ($tla == NULL) return NULL;
|
||||
|
||||
$tla->used = date("Y-m-d");
|
||||
$tla->save();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user