Flatpickr update, minor fixes in edit base javascript

This commit is contained in:
Clemens Schwaighofer
2020-06-12 09:53:31 +09:00
parent a311552c56
commit 96104095d0
5 changed files with 21 additions and 7 deletions

View File

@@ -213,6 +213,16 @@ print "RETURN DATA FOR search_path: ".$data."<br>";
$status = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")"); $status = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>"; print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
print "<b>NULL TEST DB READ</b><br>";
$q = "SELECT uid, null_varchar, null_int FROM test_null_data WHERE uid = 'A'";
$res = $basic->dbReturnRow($q);
var_dump($res);
print "RES: ".$basic->printAr($res)."<br>";
print "ISSET: ".isset($res['null_varchar'])."<br>";
print "EMPTY: ".empty($res['null_varchar'])."<br>";
// data read test
// time string thest // time string thest
$timestamp = 5887998.33445; $timestamp = 5887998.33445;
$time_string = $basic->timeStringFormat($timestamp); $time_string = $basic->timeStringFormat($timestamp);

View File

@@ -437,7 +437,9 @@ function actionIndicatorShow(loc, overlay = true)
{ {
// console.log('Indicator: SHOW [%s]', loc); // console.log('Indicator: SHOW [%s]', loc);
if (!$('#indicator').is(':visible')) { if (!$('#indicator').is(':visible')) {
$('#indicator').addClass('progress'); if (!$('#indicator').hasClass('progress')) {
$('#indicator').addClass('progress');
}
setCenter('indicator', true, true); setCenter('indicator', true, true);
$('#indicator').show(); $('#indicator').show();
} }
@@ -457,7 +459,6 @@ function actionIndicatorHide(loc, overlay = true)
{ {
// console.log('Indicator: HIDE [%s]', loc); // console.log('Indicator: HIDE [%s]', loc);
$('#indicator').hide(); $('#indicator').hide();
$('#indicator').removeClass('progress');
if (overlay === true) { if (overlay === true) {
overlayBoxHide(); overlayBoxHide();
} }
@@ -543,6 +544,8 @@ function showActionIndicator(loc)
el.className = 'progress hide'; el.className = 'progress hide';
el.id = 'indicator'; el.id = 'indicator';
$('body').append(el); $('body').append(el);
} else if (!$('#indicator').hasClass('progress')) {
$('#indicator').addClass('progress');
} }
// indicator not visible // indicator not visible
if (!$('#indicator').is(':visible')) { if (!$('#indicator').is(':visible')) {

View File

@@ -53,7 +53,8 @@
] ]
}, },
time_24hr: true, time_24hr: true,
rangeSeparator: ' から ' rangeSeparator: " から ",
firstDayOfWeek: 1
}; };
fp.l10ns.ja = Japanese; fp.l10ns.ja = Japanese;
var ja = fp.l10ns; var ja = fp.l10ns;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long