From 03019f2ebed2898bffb44193d1a7492ff99d5e21 Mon Sep 17 00:00:00 2001 From: Cristiano de Paula Date: Mon, 2 Oct 2023 21:25:49 +0000 Subject: [PATCH 1/2] adding advanced components on Library --- pdf/static/js/pdf_edit.js | 60 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/pdf/static/js/pdf_edit.js b/pdf/static/js/pdf_edit.js index 4384c6e..ecfcf39 100644 --- a/pdf/static/js/pdf_edit.js +++ b/pdf/static/js/pdf_edit.js @@ -1,5 +1,23 @@ /* Javascript for pdfXBlock. */ function pdfXBlockInitEdit(runtime, element) { + + // TODO: remove logs below + console.log('============================'); + console.log('Im inside PDF edit...'); + console.log('============================'); + console.log(`runtime: ${runtime}`); + console.log(`typeof: ${typeof(runtime)}`); + console.log('============================'); + console.log(`element: ${JSON.stringify(element[0].dataset['usageId'].split(':')['0'])}`); + console.log(`element: ${JSON.stringify(element[0].dataset['usageId'].slice(0, 3))}`); + console.log(`typeof: ${typeof(element)}`); + console.log('============================'); + + // TODO: remove comment below + // check if it is a library + var usageId = element[0].dataset['usageId']; + var isLibrary = usageId.slice(0, 3) === "lib"; + $(element).find('.action-cancel').bind('click', function () { runtime.notify('cancel', {}); $('.pdf_placeholder').hide(); @@ -45,7 +63,17 @@ function pdfXBlockInitEdit(runtime, element) { var formData = new FormData(); formData.append('file', file); var request = new XMLHttpRequest(); - var course_key = element[0].dataset['usageId'].split('+', 3).join('+').replace('block', 'course'); + //var course_key = element[0].dataset['usageId'].split('+', 3).join('+').replace('block', 'course'); + + + // TODO: remove comments below + // It will replace: + // 'block' by 'course' OR 'lib-block' by 'library' + var splitCount = isLibrary ? 2 : 3; + var keyword = isLibrary ? 'lib-block' : 'block'; + var replacement = isLibrary ? 'library' : 'course'; + var course_key = usageId.split('+', splitCount).join('+').replace(keyword, replacement); + var upload_url = '/assets/' + course_key + '/'; var csrftoken = $.cookie('csrftoken'); var alertField = $('.alert-field'); @@ -104,10 +132,38 @@ function pdfXBlockInitEdit(runtime, element) { dropZone.style.background = "white"; }; dropZone.ondrop = function(ev) { + // TODO: remove logs below + console.log('============================'); + console.log('Im inside onDrop...'); + console.log('============================'); + console.log(`element (ondrop): ${JSON.stringify(element)}`); + console.log('============================'); + console.log(isLibrary ? "IT IS A LIBRARY (ondrop)..." : "IT IS A COURSE..."); + var oFile = ev.dataTransfer.files[0]; var request = new XMLHttpRequest(); var reader = new FileReader(); - var course_key = element[0].dataset['usageId'].split('+', 3).join('+').replace('block', 'course'); + // TODO: remove comment below + // this is the original code: + //var course_key = element[0].dataset['usageId'].split('+', 2).join('+').replace('block', 'course'); + + // this is the new code: + var splitCount = isLibrary ? 2 : 3; + var keyword = isLibrary ? 'lib-block' : 'block'; + var replacement = isLibrary ? 'library' : 'course'; // <== It doesn't works + //var replacement = isLibrary ? 'course' : 'course'; // <== It works + var course_key = usageId.split('+', splitCount).join('+').replace(keyword, replacement); + + // TODO: remove logs below + // if (isLibrary) course_key = `${course_key}+2023-01-01` // <== It works + // the 'library key' format will be changed + // from: library-v1:Triboo+CSPROB + // to: course-v1:Triboo+CSPROB+2023-01-01 + + // TODO: remove logs below + console.info(`course_key: ${course_key}`); + console.info(`course_key (type): ${typeof(course_key)}`); + var upload_url = '/assets/' + course_key + '/'; var csrftoken = $.cookie('csrftoken'); var alertField = $('.alert-field'); From c359b6c015c49ed1e889bd80881b7e6384cd2e40 Mon Sep 17 00:00:00 2001 From: Cristiano de Paula Date: Fri, 6 Oct 2023 19:53:46 +0000 Subject: [PATCH 2/2] removing console logs --- pdf/static/js/pdf_edit.js | 44 +-------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/pdf/static/js/pdf_edit.js b/pdf/static/js/pdf_edit.js index ecfcf39..8f60edc 100644 --- a/pdf/static/js/pdf_edit.js +++ b/pdf/static/js/pdf_edit.js @@ -1,19 +1,6 @@ /* Javascript for pdfXBlock. */ function pdfXBlockInitEdit(runtime, element) { - // TODO: remove logs below - console.log('============================'); - console.log('Im inside PDF edit...'); - console.log('============================'); - console.log(`runtime: ${runtime}`); - console.log(`typeof: ${typeof(runtime)}`); - console.log('============================'); - console.log(`element: ${JSON.stringify(element[0].dataset['usageId'].split(':')['0'])}`); - console.log(`element: ${JSON.stringify(element[0].dataset['usageId'].slice(0, 3))}`); - console.log(`typeof: ${typeof(element)}`); - console.log('============================'); - - // TODO: remove comment below // check if it is a library var usageId = element[0].dataset['usageId']; var isLibrary = usageId.slice(0, 3) === "lib"; @@ -63,12 +50,6 @@ function pdfXBlockInitEdit(runtime, element) { var formData = new FormData(); formData.append('file', file); var request = new XMLHttpRequest(); - //var course_key = element[0].dataset['usageId'].split('+', 3).join('+').replace('block', 'course'); - - - // TODO: remove comments below - // It will replace: - // 'block' by 'course' OR 'lib-block' by 'library' var splitCount = isLibrary ? 2 : 3; var keyword = isLibrary ? 'lib-block' : 'block'; var replacement = isLibrary ? 'library' : 'course'; @@ -132,38 +113,15 @@ function pdfXBlockInitEdit(runtime, element) { dropZone.style.background = "white"; }; dropZone.ondrop = function(ev) { - // TODO: remove logs below - console.log('============================'); - console.log('Im inside onDrop...'); - console.log('============================'); - console.log(`element (ondrop): ${JSON.stringify(element)}`); - console.log('============================'); - console.log(isLibrary ? "IT IS A LIBRARY (ondrop)..." : "IT IS A COURSE..."); - var oFile = ev.dataTransfer.files[0]; var request = new XMLHttpRequest(); var reader = new FileReader(); - // TODO: remove comment below - // this is the original code: - //var course_key = element[0].dataset['usageId'].split('+', 2).join('+').replace('block', 'course'); // this is the new code: var splitCount = isLibrary ? 2 : 3; var keyword = isLibrary ? 'lib-block' : 'block'; - var replacement = isLibrary ? 'library' : 'course'; // <== It doesn't works - //var replacement = isLibrary ? 'course' : 'course'; // <== It works + var replacement = isLibrary ? 'library' : 'course'; var course_key = usageId.split('+', splitCount).join('+').replace(keyword, replacement); - - // TODO: remove logs below - // if (isLibrary) course_key = `${course_key}+2023-01-01` // <== It works - // the 'library key' format will be changed - // from: library-v1:Triboo+CSPROB - // to: course-v1:Triboo+CSPROB+2023-01-01 - - // TODO: remove logs below - console.info(`course_key: ${course_key}`); - console.info(`course_key (type): ${typeof(course_key)}`); - var upload_url = '/assets/' + course_key + '/'; var csrftoken = $.cookie('csrftoken'); var alertField = $('.alert-field');