alphabetize and other

SmearcarDB/server.py

@@ -60,9 +60,9 @@ class Editor(db.Model):
 
 def database():
     final = {'values': []}
-    final['languages'] = [f.name for f in Language.query.all()]
+    final['languages'] = [f.name for f in Language.query.order_by(Language.name).all()]
     final['phonemes'] = [f.name for f in Phoneme.query.all()]
-    for language in Language.query.all():
+    for language in Language.query.order_by(Language.name).all():
         languageobject = {'id': language.id,
                           'name': language.name,
                           'source': language.source,
@@ -70,6 +70,7 @@ def database():
         for frequency in language.phonemes:
             languageobject['phonemes'][frequency.phoneme.name] = frequency.value
         final['values'].append(languageobject)
+    print(final)
     return final
 
 def phoneme_add(info):

SmearcarDB/static/index.js

@@ -1,5 +1,5 @@
 var navSelect = "home";
-var dataMode 
+var dataMode;
 var serverURL = window.location.origin;
 var data;
 var languageChart;
@@ -17,7 +17,7 @@ var navi = [ // Array containing navigation items in form [Font-Awesome class na
 ];
 
 var members = [
-    "Kenneth Jao", "Yaman Qalieh", "Enrico Colon", "Arav Agarwal"
+    "Kenneth Jao", "Yaman Qalieh", "Enrico Colon"
 ];
 
 var dropOp = {
@@ -219,7 +219,7 @@ function generateDropOp() { // For options that change based on data.
             dataBox.style.opacity = "1";
             graph.style.opacity = "1";
         }, 300);
-    }].concat(["Select language..."].concat(data.languages))
+    }].concat(["Select language..."].concat(data.languages));
 }
 
 function closeEditInput() {
@@ -280,7 +280,7 @@ function createDrop() {
             setTimeout(function() {
                 document.getElementById("newLanguage").style.opacity = "1";
             }, 10);
-        }
+        };
         p3.appendChild(document.createTextNode("Add language..."));
         div2.appendChild(p3);
 
@@ -335,7 +335,7 @@ document.onclick = function(event) {
             opCont.style.display = "none";
         }, 300);
     }
-}
+};
 
 function homeCards() {
     // GET posts from server
@@ -439,11 +439,11 @@ document.getElementById("newLanguage").onclick = function(event) { // Close add
     setTimeout(function() {
        document.getElementById("editLanguage").style.display = "none";
     }, 300);
-}
+};
 
 document.querySelectorAll("#newLanguage > div")[0].onclick = function(event) {
     event.stopPropagation();
-}
+};
 
 document.getElementById("editData").onclick = function() { // Open edit language.
     var langInfo = language(dropOpStore["langSelect"]);
@@ -459,7 +459,7 @@ document.getElementById("editData").onclick = function() { // Open edit language
     setTimeout(function() {
         document.getElementById("editLanguage").style.opacity = "1";
     }, 10);
-}
+};
 
 document.querySelectorAll("#newLanguageSubmit p")[0].onclick = function() {
     if(!submittable) return;
@@ -522,7 +522,7 @@ document.querySelectorAll("#newLanguageSubmit p")[0].onclick = function() {
             console.log(e);
         }
     );
-}
+};
 
 document.querySelectorAll("#editLanguageSubmit p")[0].onclick = function() {
     if(!submittable) return;
@@ -574,7 +574,7 @@ document.querySelectorAll("#editLanguageSubmit p")[0].onclick = function() {
         name: newLanguage.name !== langInfo.name,
         add: diffChange.length > 0,
         remove: diffRemove.length > 0
-    }
+    };
 
     var error = false;
 
@@ -665,7 +665,7 @@ document.querySelectorAll("#editLanguageSubmit p")[0].onclick = function() {
                     language_id: langInfo.id,
                     phoneme_id: diffRemove[i]
                 }
-            })
+    });
 
     for(var i = 0; i < diffRemove.length; i++) { // Ajax requests for removing phoneme values.
         $.ajax({
@@ -705,7 +705,7 @@ document.querySelectorAll("#editLanguageSubmit p")[0].onclick = function() {
             }
         );
     }
-}
+};
 
 /*function getTrelloCards() {
     Trello.authorize();