Skip to content
Snippets Groups Projects
Commit cb0fee1b authored by Hakkel Tamas's avatar Hakkel Tamas
Browse files

registration and photo annotation saving bugfix, change navbar collapse from sm to md

parent 4884a05f
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ $today = strtotime(date('Y-m-d').' 00:00 GMT') * 1000; ...@@ -7,7 +7,7 @@ $today = strtotime(date('Y-m-d').' 00:00 GMT') * 1000;
$enabled_time_window = 20000; $enabled_time_window = 20000;
$enabled_trials_per_day = 5; $enabled_trials_per_day = 5;
if (! isset($_POST['action'])) if (! isset($_POST['action']) || ! $_POST['action'])
send('page loaded'); send('page loaded');
$statement = $db->prepare(' $statement = $db->prepare('
...@@ -70,6 +70,8 @@ if ($last_action === 'start' AND $last_timestamp > $now - $enabled_time_window) ...@@ -70,6 +70,8 @@ if ($last_action === 'start' AND $last_timestamp > $now - $enabled_time_window)
} else { } else {
if ( ! $user->isRegistered) if ( ! $user->isRegistered)
saveUser($card_IDs[0]['card_ID']); saveUser($card_IDs[0]['card_ID']);
else
updateUser($card_IDs[0]['card_ID']);
sqlSave('success'); sqlSave('success');
send('success'); send('success');
} }
...@@ -107,15 +109,7 @@ function isCardAlreadyRegistered($card_ID) { ...@@ -107,15 +109,7 @@ function isCardAlreadyRegistered($card_ID) {
} }
function saveUser($card_ID) { function saveUser($card_ID) {
global $db, $user; global $db;
if ($user->isRegistered) {
$statement = $db->prepare("
UPDATE user SET card_ID = :card_ID
WHERE shibboleth = :shibboleth");
$statement->execute([
'card_ID' => $card_ID,
'shibboleth' => $user->shibboleth ]);
} else {
$statement = $db->prepare(" $statement = $db->prepare("
INSERT INTO user (shibboleth, name, email, card_ID, language) INSERT INTO user (shibboleth, name, email, card_ID, language)
VALUES (:shibboleth, :name, :email, :card_ID, :language)"); VALUES (:shibboleth, :name, :email, :card_ID, :language)");
...@@ -126,6 +120,15 @@ function saveUser($card_ID) { ...@@ -126,6 +120,15 @@ function saveUser($card_ID) {
'card_ID' => $card_ID, 'card_ID' => $card_ID,
'language' => $_POST['language'] ]); 'language' => $_POST['language'] ]);
} }
function updateUser($card_ID) {
global $db, $user;
$statement = $db->prepare("
UPDATE user SET card_ID = :card_ID
WHERE shibboleth = :shibboleth");
$statement->execute([
'card_ID' => $card_ID,
'shibboleth' => $user->shibboleth ]);
} }
function sqlSave($action) { function sqlSave($action) {
......
waitFor("jQuery", () => ajax(processReceivedData) ); waitFor("jQuery", () => ajax(processReceivedData) );
function processReceivedData(parsed) { function processReceivedData(parsed) {
info(parsed.message, isRegistered);
if (parsed.message === "page loaded") if (parsed.message === "page loaded")
languageSwitch(parsed.language); languageSwitch(parsed.language === null ? browserLanguage() : parsed.language);
info(parsed.message, isRegistered);
if (parsed.message === 'waiting') { if (parsed.message === 'waiting') {
$(".time").text(Math.min(20,Math.abs(Math.floor((parsed.timestamp - Date.now()) / 1000)))); $(".time").text(Math.min(20,Math.abs(Math.floor((parsed.timestamp - Date.now()) / 1000))));
setTimeout(start, 300); setTimeout(start, 300);
......
...@@ -74,6 +74,7 @@ function navbarAdjustments(isAdmin, isRegistered) { ...@@ -74,6 +74,7 @@ function navbarAdjustments(isAdmin, isRegistered) {
$("#auth-1 a").attr("href", "{BASE_URL}auth"); $("#auth-1 a").attr("href", "{BASE_URL}auth");
$("#auth-1").attr("id","auth"); $("#auth-1").attr("id","auth");
$("#auth-2").hide(); $("#auth-2").hide();
$("#profile, #verified, #unverified, #auth-1").show();
} else { } else {
$("#auth").attr("id","auth-1"); $("#auth").attr("id","auth-1");
$("#auth-2 a").attr("href", "{BASE_URL}auth"); $("#auth-2 a").attr("href", "{BASE_URL}auth");
......
<?php <?php
function navbar($menu) { ?> function navbar($menu) { ?>
<nav class="navbar fixed-top navbar-expand-sm navbar-light bg-light"> <nav class="navbar fixed-top navbar-expand-md navbar-light bg-light">
<a class="navbar-brand" href="{PUBLIC_URL}"> <a class="navbar-brand" href="{PUBLIC_URL}">
<svg width="30" height="30" class="d-inline-block align-top" xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 289 289"> <svg width="30" height="30" class="d-inline-block align-top" xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 289 289">
<g transform="translate(341 71)"> <g transform="translate(341 71)">
...@@ -11,7 +11,7 @@ function navbar($menu) { ?> ...@@ -11,7 +11,7 @@ function navbar($menu) { ?>
<path d="M-116 138h-35a5 5 0 1 0 0 10h35a5 5 0 0 0 0-10z"/> <path d="M-116 138h-35a5 5 0 1 0 0 10h35a5 5 0 0 0 0-10z"/>
</g> </g>
</svg> </svg>
<span id="page-name" class="d-sm-none"></span> <span id="page-name" class="d-md-none"></span>
</a> </a>
<div class="collapse navbar-collapse" id="navbarToggle"> <div class="collapse navbar-collapse" id="navbarToggle">
<ul class="navbar-nav" style="display:none"><?php <ul class="navbar-nav" style="display:none"><?php
...@@ -25,20 +25,20 @@ function navbar($menu) { ?> ...@@ -25,20 +25,20 @@ function navbar($menu) { ?>
</ul> </ul>
</div> </div>
<?php if (function_exists('navbar_extra')): ?> <?php if (function_exists('navbar_extra')): ?>
<ul class="nav navbar-nav mx-auto d-none d-sm-inline-block pt-2"> <ul class="nav navbar-nav mx-auto d-none d-md-inline-block pt-2">
<?=navbar_extra()?> <?=navbar_extra()?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
<div class="languages small d-none d-sm-block ml-3 mr-1 font-weight-bold"> <div class="languages small d-none d-md-block ml-3 mr-1 font-weight-bold">
<a href="javascript:changeLanguage('en')">en</a><br> <a href="javascript:changeLanguage('en')">en</a><br>
<a href="javascript:changeLanguage('hu')">hu</a> <a href="javascript:changeLanguage('hu')">hu</a>
</div> </div>
<div class="languages languages-mobile d-sm-none d-inline-block" style="display:none!important"> <div class="languages languages-mobile d-md-none d-inline-block" style="display:none!important">
<a href="javascript:changeLanguage('en')">en</a> <span>/</span> <a href="javascript:changeLanguage('en')">en</a> <span>/</span>
<a href="javascript:changeLanguage('hu')">hu</a> <a href="javascript:changeLanguage('hu')">hu</a>
</div> </div>
<?php if (function_exists('navbar_extra')): ?> <?php if (function_exists('navbar_extra')): ?>
<div class="d-sm-none d-inline-block mx-auto pt-2"> <div class="d-md-none d-inline-block mx-auto pt-2">
<?=navbar_extra()?> <?=navbar_extra()?>
</div> </div>
<?php endif; ?> <?php endif; ?>
......
...@@ -85,7 +85,8 @@ function save() { ...@@ -85,7 +85,8 @@ function save() {
var postData = { var postData = {
accepted: getIDs("[type=checkbox]:checked"), accepted: getIDs("[type=checkbox]:checked"),
rejected: getIDs("[type=checkbox]:not(:checked):not(:indeterminate)"), rejected: getIDs("[type=checkbox]:not(:checked):not(:indeterminate)"),
last_timestamp: last_timestamp last_timestamp: last_timestamp,
page: page
}; };
ajax(parsed => { ajax(parsed => {
if (parsed["message"] == "saving error") { if (parsed["message"] == "saving error") {
......
...@@ -71,10 +71,9 @@ function loadMoreEntries() { ...@@ -71,10 +71,9 @@ function loadMoreEntries() {
function deleteAccount() { function deleteAccount() {
ajax(parsed => { ajax(parsed => {
console.log(parsed);
if ( ! ("message" in parsed) || parsed.message != "success") if ( ! ("message" in parsed) || parsed.message != "success")
$('#error').modal("show"); $('#error').modal("show");
else else
window.location.replace("{PUBLIC_URL}"); $('#account-deleted').modal("show");
}, { command: "delete account" }); }, { command: "delete account" });
} }
\ No newline at end of file
...@@ -138,7 +138,7 @@ function site_content() { ...@@ -138,7 +138,7 @@ function site_content() {
{Are you sure you want to delete your account?|Biztos szeretnéd törölni a fiókod?} {Are you sure you want to delete your account?|Biztos szeretnéd törölni a fiókod?}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-danger" onclick="deleteAccount()"> <button type="button" class="btn btn-danger" onclick="deleteAccount()" data-dismiss="modal">
{Delete account|Regisztráció törlése} {Delete account|Regisztráció törlése}
</button> </button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"> <button type="button" class="btn btn-secondary" data-dismiss="modal">
...@@ -149,6 +149,22 @@ function site_content() { ...@@ -149,6 +149,22 @@ function site_content() {
</div> </div>
</div> </div>
<div class="modal fade" id="account-deleted" tabindex="-1" role="dialog" aria-labelledby="modal-title" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="modal-title">Account deleted</h5>
</div>
<div class="modal-body">
{Your account is successfully deleted and all your data has been erased from our database.|Fiókodat sikeresen töröltük minden adatbázisunkban tárolt adatoddal együtt.}
</div>
<div class="modal-footer">
<a href="{PUBLIC_URL}" class="btn btn-primary">OK</a>
</div>
</div>
</div>
</div>
<div class="modal fade" id="error" tabindex="-1" role="dialog" aria-labelledby="modal-title" aria-hidden="true"> <div class="modal fade" id="error" tabindex="-1" role="dialog" aria-labelledby="modal-title" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment