From d948baa82de185de8f380395a319231aaa38c973 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Mon, 20 Mar 2017 15:34:49 +0000 Subject: [PATCH] Test-Pfad entfernt --- web/ui/ui.js | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 2 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 345603d..3deda97 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -40,6 +40,7 @@ $("#mce-editor").hide(); $('.codeeditor-space').hide(); $('.code-editor-container').hide(); + $('.sued').hide(); //$('.ost').attr('flex-basis', 0); $('#newTextFile').on('click', fm_menu_neue_textdatei); $('#newDoc').on('click', fm_menu_neues_dokument); @@ -61,11 +62,14 @@ $('#m-paste').on('click', fm_menu_paste); $('#m-shrink').on('click', fm_menu_shrink); $('#m-test').on('click', fm_menu_test); - $('#m-test-2').on('click', fm_menu_test_2); + $('#m-test-2').on('click', fm_menu_compile); + $('#m-test-3').on('click', fm_menu_compile_all); + $('#m-compile-results').on('click', fm_fusszeile_zeigen); $('#saveModal').on('hidden.bs.modal', function (e) { $('#modal_ok').attr('onclick','').unbind('click'); }); $('#logout').click(fm_logout); + $('#fusszeile-schliessen').on('click', fm_fusszeile_schliessen); fm_get_login(); fm_get_list(''); fm_init_uploader(); @@ -88,6 +92,14 @@ } catch (err) { } }, 200); +} + +function fm_fusszeile_schliessen() { + $('.sued').hide(); +} + +function fm_fusszeile_zeigen() { + $('.sued').show(); } function fm_get_path(uid) { @@ -265,6 +277,7 @@ */ function fm_gewaehlte_dateien() { var gewaehlte = $('.datei-gewaehlt'); + /* //console.log('anzahl: ' + gewaehlte.length); var fnames = new Array(); var i = 0; @@ -280,7 +293,27 @@ // {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]} // und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat return liste; + */ + return fm_dateiliste_bilden(gewaehlte); } + +function fm_dateiliste_bilden(gewaehlte) { + var fnames = new Array(); + var i = 0; + while(i < gewaehlte.length) { + var str = { "java.lang.String": $(gewaehlte[i]).text()}; + fnames.push(str); + //console.log('loeschen ' + pfad + ' ' + $(gewaehlte[i]).text()); + //i += 2; + i++; + } + var liste = '{"List":' + JSON.stringify(fnames) + '}'; + // 'liste' enthaelt: + // {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]} + // und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat + return liste; +} + /* --------- Dateifunktionen Ende ---------- */ function fm_menu_test() { @@ -294,14 +327,18 @@ } } -function fm_menu_test_2() { +function fm_menu_compile() { fm_compile('0', fm_mark_compile_results_in_editor); +} +function fm_menu_compile_all() { + fm_compile_all(); } function fm_mark_compile_results_in_editor(resp) { cm.clearGutter("breakpoints"); if(resp.List[0].CompilerIssue !== undefined) { + cm.setGutterMarker(0, "breakpoints", makeMarker("Code hat Fehler")); var lno; var eMsg; if(resp.List[0].CompilerIssue instanceof Array) { @@ -322,6 +359,64 @@ cm.setGutterMarker(lno-1, "breakpoints", makeMarker(eMsg)); } } +} + +function fm_compile_all() { + var m = '?c=de.uhilger.filecms.api.CompileService&m=compileAll&p=' + pfad; + var u = '../svc' + m; + fm_get(u, "json", function(resp) { + if(resp.List[0].CompilerIssue !== undefined) { + var lno; + var eMsg; + var issueList = new Array(); + if(resp.List[0].CompilerIssue instanceof Array) { + var issueNo = 0; + while(issueNo < resp.List[0].CompilerIssue.length) { + /* + $('.system-out').append(' +++ ---- +++ '); + $('.system-out').append(resp.List[0].CompilerIssue[issueNo].kind); + $('.system-out').append(resp.List[0].CompilerIssue[issueNo].lineNumber); + $('.system-out').append(resp.List[0].CompilerIssue[issueNo].sourceName); + $('.system-out').append(resp.List[0].CompilerIssue[issueNo].message); + */ + var issue = new CompilerIssue( + resp.List[0].CompilerIssue[issueNo].sourceName, + resp.List[0].CompilerIssue[issueNo].message, + resp.List[0].CompilerIssue[issueNo].kind, + resp.List[0].CompilerIssue[issueNo].lineNumber + ); + issueList.push(issue); + + /* + console.log(' +++ ---- +++ '); + console.log(resp.List[0].CompilerIssue[issueNo].kind); + console.log(resp.List[0].CompilerIssue[issueNo].lineNumber); + console.log(resp.List[0].CompilerIssue[issueNo].sourceName); + console.log(resp.List[0].CompilerIssue[issueNo].message); + */ + issueNo++; + } + } else { + //lno = resp.List[0].CompilerIssue.lineNumber; + //eMsg = resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message; + //$('.system-out').append(lno + ' ' + eMsg); + //console.log(lno + ' ' + eMsg); + var issue = new CompilerIssue( + resp.List[0].CompilerIssue.sourceName, + resp.List[0].CompilerIssue.message, + resp.List[0].CompilerIssue.kind, + resp.List[0].CompilerIssue.lineNumber + ); + issueList.push(issue); + } + var theList = new IssueList(issueList); + var template = $('#tpl-ci').html(); + Mustache.parse(template); // optional, speeds up future uses + $('.system-out').empty(); + $('.system-out').html(Mustache.render(template, theList)); + $('.sued').show(); + } + }); } function fm_compile(modeStr, callback) { @@ -1015,6 +1110,18 @@ /* ----- Objekte ----- */ +function IssueList(il) { + this.issues = il; +} + +function CompilerIssue(sn, ms, ki, ln) { + var self = this; + this.sourceName = sn; + this.message = ms; + this.kind = ki; + this.lineNumber = ln; +} + function FileList(fl) { this.files = fl; } -- Gitblit v1.9.3