Merge pull request #4 from duongban/dev

Merge dev

flash_cards.py

@@ -171,8 +171,8 @@ def delete(card_id):
     return redirect(url_for('cards'))
 
 @app.route('/memorize')
-@app.route('/memorize/<card_id>')
 @app.route('/memorize/<card_type>')
+@app.route('/memorize/<card_type>/<card_id>')
 def memorize(card_type, card_id=None):
     tag = getTag(card_type)
     if tag is None:
@@ -194,8 +194,8 @@ def memorize(card_type, card_id=None):
                            short_answer=short_answer, tags=tags)
 
 @app.route('/memorize_known')
-@app.route('/memorize_known/<card_id>')
 @app.route('/memorize_known/<card_type>')
+@app.route('/memorize_known/<card_type>/<card_id>')
 def memorize_known(card_type, card_id=None):
     tag = getTag(card_type)
     if tag is None:
@@ -427,7 +427,6 @@ def check_table_tag_exists():
     db = get_db()
     cur = db.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='tags'")
     result = cur.fetchone()
-    print("Table tag : ",result)
     return result
 
 def create_tag_table():

static/general.js

@@ -31,6 +31,7 @@ $(document).ready(function(){
 
         function checkit() {
             var checkedVal = $('input[name=type]:checked').val();
+            var checkedId = $('input[name=type]:checked').attr("id");
             if (checkedVal === undefined) {
                 // hide the fields
                 $('.fieldFront').hide();
@@ -38,13 +39,12 @@ $(document).ready(function(){
                 $('.saveButton').hide();
             } else {
                 $('.toggleButton').removeClass('toggleSelected');
-                $(this).addClass('toggleSelected');
-
-                // if (checkedVal == '1') {
-                //     $('textarea[name=back]').attr('rows', 5);
-                // } else {
-                //     $('textarea[name=back]').attr('rows', 12);
-                // }
+            
+                if(checkedId === undefined) {
+                    $(this).addClass('toggleSelected');
+                } else {
+                    $('label[for='+ checkedId +']').addClass('toggleSelected');
+                }
 
                 $('.fieldFront').show();
                 $('.fieldBack').show();
@@ -52,6 +52,7 @@ $(document).ready(function(){
             }
         }
 
+        console.log("Click");
         $('.toggleButton').click(checkit);
 
         checkit();