ii

mb-webpage-sample/misthios.js

@@ -2,7 +2,6 @@ logger = Polyglot.import("logger");
 coreModelService = Polyglot.import("coreModelService");
 const Collectors = Java.type("java.util.stream.Collectors");
 
-<<<<<<< HEAD
 const sql =
   'SELECT no, CONCAT(k.titel, " ", k.bezeichnung1, " ", k.bezeichnung2) FROM ( SELECT count(*) no, MandantId FROM behandlungen group by MandantId ) AS X LEFT JOIN KONTAKT k on x.MandantId = k.id;';
 var stream = coreModelService.executeNativeQuery(sql);
@@ -15,15 +14,6 @@ for (var entry of result) {
   var entry = Java.from(entry);
   _data.push(entry[0]);
   _labels.push(entry[1]);
-=======
-const sql = "SELECT count(*) , MandantId FROM behandlungen group by MandantId";
-var stream = coreModelService.executeNativeQuery(sql);
-var result = Java.from(stream.toArray());
-
-for (var ar of result) {
-    var bla = Java.from(ar)
-    print(bla[0] + " " + bla[1])
->>>>>>> 3aed852fd7b7336785f1bbaf4b1edfe27ec9ab4c
 }
 
 var json = {};