Alamantus
/
Lexiconga
mirror of https://github.com/Alamantus/Lexiconga.git
1
0
Fork 0
Code Issues Releases Activity

Got word updates working, need to fix new/edit word forms.

This commit is contained in:
Robbie Antenesse 2016-06-14 22:21:05 -07:00
parent 8109bdac69
commit ed8eec71cc
3 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/dictionaryBuilder.js
View File

@ -45,7 +45,7 @@ function AddWord() {
if (wordIndex >= 0) { if (wordIndex >= 0) {
if (WordAtIndexWasChanged(wordIndex, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition)) { if (WordAtIndexWasChanged(wordIndex, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition)) {
document.getElementById("newWordButtonArea").style.display = "none"; document.getElementById("newWordButtonArea").style.display = "none";
DisableForm(); DisableForm(wordIndex.toString());
updateConflictArea.style.display = "block"; updateConflictArea.style.display = "block";
var updateConflictText = "<span id='updateConflictMessage'>\"" + word + "\" is already in the dictionary"; var updateConflictText = "<span id='updateConflictMessage'>\"" + word + "\" is already in the dictionary";
@ -58,7 +58,7 @@ function AddWord() {
updateConflictText += '<button type="button" id="updateConfirmButton" \ updateConflictText += '<button type="button" id="updateConfirmButton" \
onclick="UpdateWord(' + wordIndex + ', \'' + htmlEntities(word) + '\', \'' + htmlEntities(pronunciation) + '\', \'' + htmlEntities(partOfSpeech) + '\', \'' + htmlEntities(simpleDefinition) + '\', \'' + htmlEntities(longDefinition) + '\'); \ onclick="UpdateWord(' + wordIndex + ', \'' + htmlEntities(word) + '\', \'' + htmlEntities(pronunciation) + '\', \'' + htmlEntities(partOfSpeech) + '\', \'' + htmlEntities(simpleDefinition) + '\', \'' + htmlEntities(longDefinition) + '\'); \
return false;">Yes, Update it</button>'; return false;">Yes, Update it</button>';
updateConflictText += ' <button type="button" id="updateCancelButton" onclick="CloseUpdateConflictArea(\'newWordButtonArea\', \'updateConflict\'); return false;">No, Leave it</button>'; updateConflictText += ' <button type="button" id="updateCancelButton" onclick="CloseUpdateConflictArea(\'\'); return false;">No, Leave it</button>';
updateConflictArea.innerHTML = updateConflictText; updateConflictArea.innerHTML = updateConflictText;
} else { } else {
@ -135,20 +135,20 @@ function EditWord(indexString) {
var partOfSpeech = htmlEntities(document.getElementById("partOfSpeech" + indexString).value).trim(); var partOfSpeech = htmlEntities(document.getElementById("partOfSpeech" + indexString).value).trim();
var simpleDefinition = htmlEntities(document.getElementById("simpleDefinition" + indexString).value).trim(); var simpleDefinition = htmlEntities(document.getElementById("simpleDefinition" + indexString).value).trim();
var longDefinition = htmlEntities(document.getElementById("longDefinition" + indexString).value); var longDefinition = htmlEntities(document.getElementById("longDefinition" + indexString).value);
// var editIndex = htmlEntities(document.getElementById("editIndex").value);
var errorMessageArea = document.getElementById("errorMessage" + indexString); var errorMessageArea = document.getElementById("errorMessage" + indexString);
var errorMessage = ""; var errorMessage = "";
var updateConflictArea = document.getElementById("updateConflict" + indexString); var updateConflictArea = document.getElementById("updateConflict" + indexString);
if (WordAtIndexWasChanged(indexString, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition)) { if (WordAtIndexWasChanged(indexString, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition)) {
document.getElementById("editWordButtonArea" + indexString).style.display = "none"; document.getElementById("editWordButtonArea" + indexString).style.display = "none";
DisableForm(); DisableForm(indexString);
updateConflictArea.style.display = "block"; updateConflictArea.style.display = "block";
updateConflictArea.innerHTML = "<span id='updateConflictMessage" + indexString + "'>Do you really want to change the word \"" + currentDictionary.words[parseInt(indexString)].name + "\" to what you have set above?</span>"; updateConflictArea.innerHTML = "<span id='updateConflictMessage" + indexString + "'>Do you really want to change the word \"" + currentDictionary.words[parseInt(indexString)].name + "\" to what you have set above?</span><br>";
updateConflictArea.innerHTML += '<button type="button" id="updateConfirmButton' + indexString + '" \ updateConflictArea.innerHTML += '<button type="button" id="updateConfirmButton' + indexString + '" \
onclick="UpdateWord(' + indexString + ', \'' + htmlEntities(word) + '\', \'' + htmlEntities(pronunciation) + '\', \'' + htmlEntities(partOfSpeech) + '\', \'' + htmlEntities(simpleDefinition) + '\', \'' + htmlEntities(longDefinition) + '\'); \ onclick="UpdateWord(' + indexString + ', \'' + htmlEntities(word) + '\', \'' + htmlEntities(pronunciation) + '\', \'' + htmlEntities(partOfSpeech) + '\', \'' + htmlEntities(simpleDefinition) + '\', \'' + htmlEntities(longDefinition) + '\'); \
return false;">Yes, Update it</button>'; return false;">Yes, Update it</button>';
updateConflictArea.innerHTML += '<button type="button" id="updateCancelButton' + indexString + '" onclick="CloseUpdateConflictArea(\'editWordButtonArea' + indexString + '\',\'updateConflict' + indexString + '\'); return false;">No, Leave it</button>'; updateConflictArea.innerHTML += '<button type="button" id="updateCancelButton' + indexString + '" onclick="CloseUpdateConflictArea(\'' + indexString + '\'); return false;">No, Leave it</button>';
} else { } else {
errorMessage = "No change has been made to \"" + word + "\""; errorMessage = "No change has been made to \"" + word + "\"";
if (currentDictionary.words[parseInt(indexString)].name != word) { if (currentDictionary.words[parseInt(indexString)].name != word) {
@ -428,13 +428,12 @@ function SaveAndUpdateWords(action, wordIndex) {
sendWords.setRequestHeader("Content-Type", "application/json; charset=UTF-8"); sendWords.setRequestHeader("Content-Type", "application/json; charset=UTF-8");
sendWords.onreadystatechange = function() { sendWords.onreadystatechange = function() {
if (sendWords.readyState == 4 && sendWords.status == 200) { if (sendWords.readyState == 4 && sendWords.status == 200) {
if (sendWords.responseText == "sent successfully") { if (sendWords.responseText == "updated successfully") {
// If updated successfully, then reload the dictionary from server.
console.log(sendWords.responseText); console.log(sendWords.responseText);
LoadUserDictionaries(); LoadUserDictionaries();
ProcessLoad(); ProcessLoad();
} else if (isNaN(parseInt(sendWords.responseText))) { } else { // Otherwise it is creating (a) new word(s).
console.log(sendWords.responseText);
} else { // It will only be a number if it is a new dictionary.
currentDictionary.externalID = parseInt(sendWords.responseText); currentDictionary.externalID = parseInt(sendWords.responseText);
LoadUserDictionaries(); LoadUserDictionaries();
ProcessLoad(); ProcessLoad();
@ -459,7 +458,7 @@ function SaveAndUpdateDictionary(keepFormContents) {
if (!keepFormContents) { if (!keepFormContents) {
ClearForm(); ClearForm();
} }
CloseUpdateConflictArea('newWordButtonArea', 'updateConflict'); CloseUpdateConflictArea('');
} }
function SaveDictionary(sendToDatabase) { function SaveDictionary(sendToDatabase) {

43
js/ui.js
View File

@ -370,31 +370,30 @@ function LockWordForm() {
wordForm.removeAttribute('style'); wordForm.removeAttribute('style');
} }
function CloseUpdateConflictArea(displayId, hideId) { function CloseUpdateConflictArea(wordIndexString) {// displayId, hideId) {
displayId = (typeof displayId !== 'undefined' && displayId != null) ? displayId : false; // displayId = (typeof displayId !== 'undefined' && displayId != null) ? displayId : false;
if (displayId != false) { // if (displayId != false) {
document.getElementById(displayId).style.display = "block"; document.getElementById("editWordButtonArea" + wordIndexString).style.display = "block";
} // }
document.getElementById(hideId).style.display = "none"; document.getElementById("updateConflict" + wordIndexString).style.display = "none";
EnableForm(); EnableForm(wordIndexString);
} }
function DisableForm() { function DisableForm(wordIndexString) {
document.getElementById("word").disabled = true; document.getElementById("word" + wordIndexString).disabled = true;
document.getElementById("pronunciation").disabled = true; document.getElementById("pronunciation" + wordIndexString).disabled = true;
document.getElementById("partOfSpeech").disabled = true; document.getElementById("partOfSpeech" + wordIndexString).disabled = true;
document.getElementById("simpleDefinition").disabled = true; document.getElementById("simpleDefinition" + wordIndexString).disabled = true;
document.getElementById("longDefinition").disabled = true; document.getElementById("longDefinition" + wordIndexString).disabled = true;
document.getElementById("editIndex").disabled = true;
} }
function EnableForm() { function EnableForm(wordIndexString) {
document.getElementById("word").disabled = false; document.getElementById("word" + wordIndexString).disabled = false;
document.getElementById("pronunciation").disabled = false; document.getElementById("pronunciation" + wordIndexString).disabled = false;
document.getElementById("partOfSpeech").disabled = false; document.getElementById("partOfSpeech" + wordIndexString).disabled = false;
document.getElementById("simpleDefinition").disabled = false; document.getElementById("simpleDefinition" + wordIndexString).disabled = false;
document.getElementById("longDefinition").disabled = false; document.getElementById("longDefinition" + wordIndexString).disabled = false;
document.getElementById("editIndex").disabled = false; // document.getElementById("editIndex").disabled = false;
} }
function ClearForm() { function ClearForm() {
@ -410,7 +409,7 @@ function ClearForm() {
document.getElementById("editWordButtonArea").style.display = "none"; document.getElementById("editWordButtonArea").style.display = "none";
document.getElementById("errorMessage").innerHTML = ""; document.getElementById("errorMessage").innerHTML = "";
document.getElementById("updateConflict").style.display = "none"; document.getElementById("updateConflict").style.display = "none";
EnableForm(); EnableForm("");
} }
} }

2
php/ajax_dictionarymanagement.php
View File

@ -239,7 +239,7 @@ function Save_New_Word($multiple = false) {
function Update_Word() { function Update_Word() {
if (isset($_SESSION['dictionary'])) { if (isset($_SESSION['dictionary'])) {
$worddata = json_decode(file_get_contents("php://input")); $worddata = json_decode(file_get_contents("php://input"), true);
$query = "UPDATE `words` SET "; $query = "UPDATE `words` SET ";