backend fixes, better case handling, some frontend changes
This commit is contained in:
@@ -49,6 +49,8 @@ class TlaController extends Controller
|
||||
'hint' => $tla->hint,
|
||||
'guesses' => $request->session()->get('guesses-'.$language, []),
|
||||
'date' => $request->session()->get('date'),
|
||||
'tla' => $request->session()->get('tla') == $tla->acronym ? $tla->acronym : NULL,
|
||||
'context' => $request->session()->get('tla') == $tla->acronym ? $tla->context : NULL,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -58,10 +60,16 @@ class TlaController extends Controller
|
||||
'guess' => 'required|array|size:3',
|
||||
]);
|
||||
$this->session_flush($request, $language);
|
||||
$tla_object = Tla::GetCurrentTla($language);
|
||||
|
||||
$session = $request->session();
|
||||
|
||||
$tla = explode(' ', Tla::GetCurrentTla($language)->abbreviation);
|
||||
$tla = explode(' ', strtolower($tla_object->acronym));
|
||||
|
||||
$guess_array = $request->all()['guess'];
|
||||
for ($i = 0; $i<3; $i++) {
|
||||
$guess_array[$i] = strtolower($guess_array[$i]);
|
||||
}
|
||||
|
||||
$proposal = [];
|
||||
|
||||
@@ -85,16 +93,24 @@ class TlaController extends Controller
|
||||
array_push($guess_array, max($proposal[0][$i], $proposal[1][$i], $proposal[2][$i]));
|
||||
}
|
||||
|
||||
$score = 0;
|
||||
|
||||
if ( $request->session()->get('guesses-'.$language, NULL) == NULL ) $request->session()->put('guesses-'.$language, [$guess_array]);
|
||||
else $request->session()->push('guesses-'.$language, $guess_array);
|
||||
for ($i = 0; $i<3; $i++) {
|
||||
$guess_array[$i] = ucfirst($guess_array[$i]);
|
||||
$score += $guess_array[$i + 3];
|
||||
}
|
||||
|
||||
$guesses = $request->session()->get('guesses-'.$language, NULL);
|
||||
if ($score == 12) $session->put('tla', $tla_object->acronym);
|
||||
|
||||
$session->push('guesses-'.$language, $guess_array);
|
||||
$guesses = $session->get('guesses-'.$language, NULL);
|
||||
|
||||
return response()->json([
|
||||
'guesses' => $request->session()->get('guesses-'.$language, []),
|
||||
'date' => $request->session()->get('date'),
|
||||
'real' => $tla
|
||||
'guesses' => $session->get('guesses-'.$language, []),
|
||||
'date' => $session->get('date'),
|
||||
'tla' => $session->get('tla') == $tla_object->acronym ? $tla_object->acronym : NULL,
|
||||
'context' => $session->get('tla') == $tla_object->acronym ? $tla_object->context : NULL,
|
||||
'score' => $score,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ class Tla extends Model
|
||||
|
||||
use HasFactory;
|
||||
|
||||
protected $fillable = ['abbreviation', 'hint', 'used'];
|
||||
protected $fillable = ['acronym', 'hint', 'used', 'context'];
|
||||
|
||||
public static function GetCurrentTla( string $language ) : Tla {
|
||||
$tla = Tla::where('used', date("Y-m-d"))
|
||||
|
||||
Reference in New Issue
Block a user