remove bei PDF Zusammenstellung auflistung der Geschoße
This commit is contained in:
salam committed
1 parent
fdfd0feb0c
commit
b07a4a0b58
3 files changed
+356
-330
No files matched your search
@@ -32,7 +32,7 @@ class Zusammenstellung
|
||||
->get();
|
||||
|
||||
foreach ($objekte as $objekt) {
|
||||
if(isset($geschosse[$objekt->id])){
|
||||
if (isset($geschosse[$objekt->id])) {
|
||||
$html .= '<tr>';
|
||||
$html .= Html::td($objekt->top_nummer, 'bl bb br');
|
||||
$html .= Html::td($geschosse[$objekt->id], 'center br bb');
|
||||
@@ -43,12 +43,12 @@ class Zusammenstellung
|
||||
$summe_nutzwert[] = $nutzwert;
|
||||
$html .= Html::td(round($nutzwert), 'center bb br');
|
||||
|
||||
$str = $nutzwert * 2 .' / '.$nutzwert_gesammt * 2 .' tel Anteil =';
|
||||
$str = $nutzwert * 2 . ' / ' . $nutzwert_gesammt * 2 . ' tel Anteil =';
|
||||
$html .= Html::td($str, 'center bb br');
|
||||
|
||||
$prozent = ($nutzwert * 2) / ($nutzwert_gesammt * 2) * 100;
|
||||
$summe_prozent[] = $prozent;
|
||||
$prozent = Format::dezimal($prozent, 3).'%';
|
||||
$prozent = Format::dezimal($prozent, 3) . '%';
|
||||
|
||||
$html .= Html::td($prozent ?? '', 'center bb br');
|
||||
$html .= '</tr>';
|
||||
@@ -58,8 +58,8 @@ class Zusammenstellung
|
||||
$html .= '<tr>';
|
||||
$html .= Html::td('', 'head bl bb', 4);
|
||||
$html .= Html::td(array_sum($summe_nutzwert), 'head center bb');
|
||||
$html .= Html::td(array_sum($summe_nutzwert) * 2 .' / '.round($nutzwert_gesammt) * 2 .' tel Anteil =', 'head center bb');
|
||||
$html .= Html::td(round(array_sum($summe_prozent)).'%', 'head center bb br');
|
||||
$html .= Html::td(array_sum($summe_nutzwert) * 2 . ' / ' . round($nutzwert_gesammt) * 2 . ' tel Anteil =', 'head center bb');
|
||||
$html .= Html::td(round(array_sum($summe_prozent)) . '%', 'head center bb br');
|
||||
$html .= '</tr>';
|
||||
$html .= '<tr style="background-color: #fff !important;">';
|
||||
$html .= Html::td('* Die Anteile wurden verdoppelt, sodaß die Mindestanteile jederzeit durch zwei geteilt werden können.', 'right small', 7, 'background-color: #fff !important;');
|
||||
@@ -109,17 +109,28 @@ class Zusammenstellung
|
||||
|
||||
$arr = [];
|
||||
foreach ($objekte as $objekt) {
|
||||
$arr[$objekt->projekt_objekte_id][] = $objekt->geschoss;
|
||||
if (!isset($arr[$objekt->projekt_objekte_id]))
|
||||
$arr[$objekt->projekt_objekte_id] = $objekt->geschoss;
|
||||
}
|
||||
// foreach ($objekte as $objekt) {
|
||||
// if ($objekt->top_nummer->nicht_in_orientierung == 1)
|
||||
// $arr[$objekt->projekt_objekte_id][] = $objekt->geschoss;
|
||||
// else
|
||||
// $arr[$objekt->projekt_objekte_id] = $objekt->geschoss;
|
||||
// }
|
||||
|
||||
foreach ($arr as $key => $value) {
|
||||
$value = array_unique($value);
|
||||
if (count($value) > 1) {
|
||||
$arr[$key] = implode('/', $value);
|
||||
} else {
|
||||
$arr[$key] = (string) array_first($value);
|
||||
}
|
||||
}
|
||||
// foreach ($arr as $key => $value) {
|
||||
// if (is_array($value)) {
|
||||
// $value = array_unique($value);
|
||||
// if (count($value) > 1) {
|
||||
// $arr[$key] = implode('/', $value);
|
||||
// } else {
|
||||
// $arr[$key] = (string) array_first($value);
|
||||
// }
|
||||
// } else {
|
||||
// $arr[$key] = (string) $value;
|
||||
// }
|
||||
// }
|
||||
|
||||
return $arr;
|
||||
}
|
||||
|
||||
Generated
+330
-315
File diff suppressed because it is too large.
Load diff
@@ -48,4 +48,4 @@ b`.split(/\n/).length!=3?function(e){for(var t=0,n=[],r=e.length;t<=r;){var i=e.
|
||||
-----
|
||||
|
||||
`]},jd={link:"URL for the link:",image:"URL of the image:"},Rd={locale:"en-US",format:{hour:"2-digit",minute:"2-digit"}},Hd={bold:"**",code:"```",italic:"*"},Wd={sbInit:"Attach files by drag and dropping or pasting from clipboard.",sbOnDragEnter:"Drop image to upload it.",sbOnDrop:"Uploading image #images_names#...",sbProgress:"Uploading #file_name#: #progress#%",sbOnUploaded:"Uploaded #image_name#",sizeUnits:" B, KB, MB"},Ud={noFileGiven:"You must select a file.",typeNotAllowed:"This image type is not allowed.",fileTooLarge:`Image #image_name# is too big (#image_size#).
|
||||
Maximum file size is #image_max_size#.`,importError:"Something went wrong when uploading the image #image_name#."};Te.prototype.uploadImages=function(o,p,v){if(o.length!==0){for(var L=[],b=0;b<o.length;b++)L.push(o[b].name),this.uploadImage(o[b],p,v);this.updateStatusBar("upload-image",this.options.imageTexts.sbOnDrop.replace("#images_names#",L.join(", ")))}};Te.prototype.uploadImagesUsingCustomFunction=function(o,p){if(p.length!==0){for(var v=[],L=0;L<p.length;L++)v.push(p[L].name),this.uploadImageUsingCustomFunction(o,p[L]);this.updateStatusBar("upload-image",this.options.imageTexts.sbOnDrop.replace("#images_names#",v.join(", ")))}};Te.prototype.updateStatusBar=function(o,p){if(this.gui.statusbar){var v=this.gui.statusbar.getElementsByClassName(o);v.length===1?this.gui.statusbar.getElementsByClassName(o)[0].textContent=p:v.length===0?console.log("EasyMDE: status bar item "+o+" was not found."):console.log("EasyMDE: Several status bar items named "+o+" was found.")}};Te.prototype.markdown=function(o){if(marked){var p;if(this.options&&this.options.renderingConfig&&this.options.renderingConfig.markedOptions?p=this.options.renderingConfig.markedOptions:p={},this.options&&this.options.renderingConfig&&this.options.renderingConfig.singleLineBreaks===!1?p.breaks=!1:p.breaks=!0,this.options&&this.options.renderingConfig&&this.options.renderingConfig.codeSyntaxHighlighting===!0){var v=this.options.renderingConfig.hljs||window.hljs;v&&(p.highlight=function(b,S){return S&&v.getLanguage(S)?v.highlight(S,b).value:v.highlightAuto(b).value})}marked.setOptions(p);var L=marked.parse(o);return this.options.renderingConfig&&typeof this.options.renderingConfig.sanitizerFunction=="function"&&(L=this.options.renderingConfig.sanitizerFunction.call(this,L)),L=qd(L),L=Fd(L),L}};Te.prototype.render=function(o){if(o||(o=this.element||document.getElementsByTagName("textarea")[0]),this._rendered&&this._rendered===o)return;this.element=o;var p=this.options,v=this,L={};function b(E){let N=E.getInputField(),K=N.form;if(K){let J=Array.from(K.elements).filter(q=>!(q.closest&&q.closest(".editor-toolbar")||q.offsetParent===null)),re=J.indexOf(N);re!==-1&&re+1<J.length&&J[re+1]&&J[re+1].focus()}}function S(E){let N=E.getInputField(),K=N.form;if(K){let J=Array.from(K.elements).filter(q=>!(q.closest&&q.closest(".editor-toolbar")||q.offsetParent===null)),re=J.indexOf(N);if(re!==-1)for(let q=re-1;q>=0;q--){let F=J[q];if(F){F.focus();break}}}}for(var s in p.shortcuts)p.shortcuts[s]!==null&&Vn[s]!==null&&(function(E){L[vc(p.shortcuts[E])]=function(){var N=Vn[E];typeof N=="function"?N(v):typeof N=="string"&&window.open(N,"_blank")}})(s);L.Enter="newlineAndIndentContinueMarkdownList",L.Tab=E=>{let N=E.getSelection();N&&N.length>0?E.execCommand("indentMore"):b(E)},L["Shift-Tab"]=E=>{let N=E.getSelection();N&&N.length>0?E.execCommand("indentLess"):S(E)},L.Esc=function(E){E.getOption("fullScreen")&&Br(v)},this.documentOnKeyDown=function(E){E=E||window.event,E.keyCode==27&&v.codemirror.getOption("fullScreen")&&Br(v)},document.addEventListener("keydown",this.documentOnKeyDown,!1);var h,g;p.overlayMode?(CodeMirror.defineMode("overlay-mode",function(E){return CodeMirror.overlayMode(CodeMirror.getMode(E,p.spellChecker!==!1?"spell-checker":"gfm"),p.overlayMode.mode,p.overlayMode.combine)}),h="overlay-mode",g=p.parsingConfig,g.gitHubSpice=!1):(h=p.parsingConfig,h.name="gfm",h.gitHubSpice=!1),p.spellChecker!==!1&&(h="spell-checker",g=p.parsingConfig,g.name="gfm",g.gitHubSpice=!1,typeof p.spellChecker=="function"?p.spellChecker({codeMirrorInstance:CodeMirror}):CodeMirrorSpellChecker({codeMirrorInstance:CodeMirror}));function C(E,N,K){return{addNew:!1}}if(CodeMirror.getMode("php").mime="text/x-php",this.codemirror=CodeMirror.fromTextArea(o,{mode:h,backdrop:g,theme:p.theme!=null?p.theme:"easymde",tabSize:p.tabSize!=null?p.tabSize:2,indentUnit:p.tabSize!=null?p.tabSize:2,indentWithTabs:p.indentWithTabs!==!1,lineNumbers:p.lineNumbers===!0,autofocus:p.autofocus===!0,extraKeys:L,direction:p.direction,lineWrapping:p.lineWrapping!==!1,allowDropFileTypes:["text/plain"],placeholder:p.placeholder||o.getAttribute("placeholder")||"",styleSelectedText:p.styleSelectedText!=null?p.styleSelectedText:!ra(),scrollbarStyle:p.scrollbarStyle!=null?p.scrollbarStyle:"native",configureMouse:C,inputStyle:p.inputStyle!=null?p.inputStyle:ra()?"contenteditable":"textarea",spellcheck:p.nativeSpellcheck!=null?p.nativeSpellcheck:!0,autoRefresh:p.autoRefresh!=null?p.autoRefresh:!1}),this.codemirror.getScrollerElement().style.minHeight=p.minHeight,typeof p.maxHeight<"u"&&this.codemirror.getScrollerElement().style.setProperty(this.hasExplicitMinHeight?"max-height":"height",p.maxHeight),p.forceSync===!0){var k=this.codemirror;k.on("change",function(){k.save()})}this.gui={};var c=document.createElement("div");c.classList.add("EasyMDEContainer"),c.setAttribute("role","application");var d=this.codemirror.getWrapperElement();d.parentNode.insertBefore(c,d),c.appendChild(d),p.toolbar!==!1&&(this.gui.t
Line truncated
|
||||
Maximum file size is #image_max_size#.`,importError:"Something went wrong when uploading the image #image_name#."};Te.prototype.uploadImages=function(o,p,v){if(o.length!==0){for(var L=[],b=0;b<o.length;b++)L.push(o[b].name),this.uploadImage(o[b],p,v);this.updateStatusBar("upload-image",this.options.imageTexts.sbOnDrop.replace("#images_names#",L.join(", ")))}};Te.prototype.uploadImagesUsingCustomFunction=function(o,p){if(p.length!==0){for(var v=[],L=0;L<p.length;L++)v.push(p[L].name),this.uploadImageUsingCustomFunction(o,p[L]);this.updateStatusBar("upload-image",this.options.imageTexts.sbOnDrop.replace("#images_names#",v.join(", ")))}};Te.prototype.updateStatusBar=function(o,p){if(this.gui.statusbar){var v=this.gui.statusbar.getElementsByClassName(o);v.length===1?this.gui.statusbar.getElementsByClassName(o)[0].textContent=p:v.length===0?console.log("EasyMDE: status bar item "+o+" was not found."):console.log("EasyMDE: Several status bar items named "+o+" was found.")}};Te.prototype.markdown=function(o){if(marked){var p;if(this.options&&this.options.renderingConfig&&this.options.renderingConfig.markedOptions?p=this.options.renderingConfig.markedOptions:p={},this.options&&this.options.renderingConfig&&this.options.renderingConfig.singleLineBreaks===!1?p.breaks=!1:p.breaks=!0,this.options&&this.options.renderingConfig&&this.options.renderingConfig.codeSyntaxHighlighting===!0){var v=this.options.renderingConfig.hljs||window.hljs;v&&(p.highlight=function(b,S){return S&&v.getLanguage(S)?v.highlight(S,b).value:v.highlightAuto(b).value})}marked.setOptions(p);var L=marked.parse(o);return this.options.renderingConfig&&typeof this.options.renderingConfig.sanitizerFunction=="function"&&(L=this.options.renderingConfig.sanitizerFunction.call(this,L)),L=qd(L),L=Fd(L),L}};Te.prototype.render=function(o){if(o||(o=this.element||document.getElementsByTagName("textarea")[0]),this._rendered&&this._rendered===o)return;this.element=o;var p=this.options,v=this,L={};function b(E){let N=E.getInputField(),K=N.form;if(K){let J=Array.from(K.elements).filter(q=>!(q.closest&&q.closest(".editor-toolbar")||q.offsetParent===null)),re=J.indexOf(N);re!==-1&&re+1<J.length&&J[re+1]&&J[re+1].focus()}}function S(E){let N=E.getInputField(),K=N.form;if(K){let J=Array.from(K.elements).filter(q=>!(q.closest&&q.closest(".editor-toolbar")||q.offsetParent===null)),re=J.indexOf(N);if(re!==-1)for(let q=re-1;q>=0;q--){let F=J[q];if(F){F.focus();break}}}}for(var s in p.shortcuts)p.shortcuts[s]!==null&&Vn[s]!==null&&(function(E){L[vc(p.shortcuts[E])]=function(){var N=Vn[E];typeof N=="function"?N(v):typeof N=="string"&&window.open(N,"_blank")}})(s);L.Enter="newlineAndIndentContinueMarkdownList",L.Tab=E=>{let N=E.getSelection();N&&N.length>0?E.execCommand("indentMore"):b(E)},L["Shift-Tab"]=E=>{let N=E.getSelection();N&&N.length>0?E.execCommand("indentLess"):S(E)},L.Esc=function(E){E.getOption("fullScreen")&&Br(v)},this.documentOnKeyDown=function(E){E=E||window.event,E.keyCode==27&&v.codemirror.getOption("fullScreen")&&Br(v)},document.addEventListener("keydown",this.documentOnKeyDown,!1);var h,g;p.overlayMode?(CodeMirror.defineMode("overlay-mode",function(E){return CodeMirror.overlayMode(CodeMirror.getMode(E,p.spellChecker!==!1?"spell-checker":"gfm"),p.overlayMode.mode,p.overlayMode.combine)}),h="overlay-mode",g=p.parsingConfig,g.gitHubSpice=!1):(h=p.parsingConfig,h.name="gfm",h.gitHubSpice=!1),p.spellChecker!==!1&&(h="spell-checker",g=p.parsingConfig,g.name="gfm",g.gitHubSpice=!1,typeof p.spellChecker=="function"?p.spellChecker({codeMirrorInstance:CodeMirror}):CodeMirrorSpellChecker({codeMirrorInstance:CodeMirror}));function C(E,N,K){return{addNew:!1}}if(CodeMirror.getMode("php").mime="text/x-php",this.codemirror=CodeMirror.fromTextArea(o,{mode:h,backdrop:g,theme:p.theme!=null?p.theme:"easymde",tabSize:p.tabSize!=null?p.tabSize:2,indentUnit:p.tabSize!=null?p.tabSize:2,indentWithTabs:p.indentWithTabs!==!1,lineNumbers:p.lineNumbers===!0,autofocus:p.autofocus===!0,extraKeys:L,direction:p.direction,lineWrapping:p.lineWrapping!==!1,allowDropFileTypes:["text/plain"],placeholder:p.placeholder||o.getAttribute("placeholder")||"",styleSelectedText:p.styleSelectedText!=null?p.styleSelectedText:!ra(),scrollbarStyle:p.scrollbarStyle!=null?p.scrollbarStyle:"native",configureMouse:C,inputStyle:p.inputStyle!=null?p.inputStyle:ra()?"contenteditable":"textarea",spellcheck:p.nativeSpellcheck!=null?p.nativeSpellcheck:!0,autoRefresh:p.autoRefresh!=null?p.autoRefresh:!1}),this.codemirror.getScrollerElement().style.minHeight=p.minHeight,typeof p.maxHeight<"u"&&this.codemirror.getScrollerElement().style.setProperty(this.hasExplicitMinHeight?"max-height":"height",p.maxHeight),p.forceSync===!0){var k=this.codemirror;k.on("change",function(){k.save()})}this.gui={};var c=document.createElement("div");c.classList.add("EasyMDEContainer"),c.setAttribute("role","application");var d=this.codemirror.getWrapperElement();d.parentNode.insertBefore(c,d),c.appendChild(d),p.toolbar!==!1&&(this.gui.t
Line truncated
|
||||
Reference in new issue
Block a user