diff options
| author | adityacp | 2020-09-09 09:34:54 +0530 |
|---|---|---|
| committer | adityacp | 2020-09-09 09:34:54 +0530 |
| commit | 196e5df3930d4c3f18dfd7e33c9821ca2f74a51e (patch) | |
| tree | 4039d736e24c75177682d4ce7299057e29f17d4d /yaksh/static | |
| parent | 2d1b8eb907c7e142d4e3c76e43707fb9f82d6683 (diff) | |
| parent | 23bf46ac2e262ceb373388196962a0bec048c6cb (diff) | |
| download | online_test-196e5df3930d4c3f18dfd7e33c9821ca2f74a51e.tar.gz online_test-196e5df3930d4c3f18dfd7e33c9821ca2f74a51e.tar.bz2 online_test-196e5df3930d4c3f18dfd7e33c9821ca2f74a51e.zip | |
Resolve conflicts
Diffstat (limited to 'yaksh/static')
| -rw-r--r-- | yaksh/static/yaksh/css/custom.css | 12 | ||||
| -rw-r--r-- | yaksh/static/yaksh/js/question_paper_creation.js | 33 |
2 files changed, 41 insertions, 4 deletions
diff --git a/yaksh/static/yaksh/css/custom.css b/yaksh/static/yaksh/css/custom.css index a3d5c79..c93b03c 100644 --- a/yaksh/static/yaksh/css/custom.css +++ b/yaksh/static/yaksh/css/custom.css @@ -132,6 +132,7 @@ body, .dropdown-menu { border: none; } +<<<<<<< HEAD /* Simple MDE editor style */ .editor-toolbar.fullscreen, .editor-preview-side { z-index: 2000 !important; @@ -158,6 +159,11 @@ body, .dropdown-menu { } ::-webkit-scrollbar-thumb { -border-radius: 8px; -background: #c2c9d2; -}
\ No newline at end of file + border-radius: 8px; + background: #c2c9d2; +} + +iframe { + display:block; + width:100%; +} diff --git a/yaksh/static/yaksh/js/question_paper_creation.js b/yaksh/static/yaksh/js/question_paper_creation.js index 9d04728..1159dd3 100644 --- a/yaksh/static/yaksh/js/question_paper_creation.js +++ b/yaksh/static/yaksh/js/question_paper_creation.js @@ -57,7 +57,37 @@ $(document).ready(function(){ $('#design_q').submit(function(eventObj) { $(this).append('<input type="hidden" name="checked_ques" value='+checked_vals+'>'); return true; -}); + }); + + $('#add_checkall').on("change", function () { + if($(this).prop("checked")) { + $("#fixed-available input:checkbox").each(function(index, element) { + if(isNaN($(this).val())) {return}; + $(this).prop("checked", true); + checked_vals.push(parseInt($(this).val())) + }); + } else { + $("#fixed-available input:checkbox").each(function(index, element){ + $(this).prop('checked', false); + checked_vals.pop(parseInt($(this).val())); + }); + } + }); + + $('#remove_checkall').on("change", function () { + if($(this).prop("checked")) { + $("#fixed-added input:checkbox").each(function (index, element) { + if(isNaN($(this).val())) { return }; + $(this).prop('checked', true); + checked_vals.push(parseInt($(this).val())); + }); + } else { + $("#fixed-added input:checkbox").each(function (index, element) { + $(this).prop('checked', false); + checked_vals.pop(parseInt($(this).val())); + }); + } + }); });//document function append_tag(tag){ @@ -69,3 +99,4 @@ function append_tag(tag){ tag_name.value = tag.value; } } + |