Merge pull request #409 from Strongminds/feature/KITOSUDV-1012-localreference

Feature/kitosudv 1012 localreference

Author: mrjsawdk

Presentation.Web/app/components/it-system/it-system-overview.controller.ts

@@ -306,6 +306,27 @@
                         .withSourceValueEchoRendering()
                         .withContentOverflow()
                         .withSourceValueEchoExcelOutput())
+                .withColumn(builder =>
+                    builder
+                        .withDataSourceName("LocalReferenceTitle")
+                        .withTitle("Lokal Reference")
+                        .withId("ReferenceId")
+                        .withStandardWidth(150)
+                        .withFilteringOperation(Utility.KendoGrid.KendoGridColumnFiltering.Contains)
+                        .withContentAlignment(Utility.KendoGrid.KendoColumnAlignment.Left)
+                        .withRendering(dataItem => Helpers.RenderFieldsHelper.renderReference(dataItem.LocalReferenceTitle, dataItem.LocalReferenceUrl))
+                        .withExcelOutput(dataItem => Helpers.ExcelExportHelper.renderReference(dataItem.LocalReferenceTitle, dataItem.LocalReferenceUrl)))
+                .withColumn(builder =>
+                    builder
+                        .withDataSourceName("LocalReferenceDocumentId")
+                        .withTitle("Dokument ID / Sagsnr.")
+                        .withId("folderref")
+                        .withStandardWidth(150)
+                        .withFilteringOperation(Utility.KendoGrid.KendoGridColumnFiltering.Contains)
+                        .withInitialVisibility(false)
+                        .withContentAlignment(Utility.KendoGrid.KendoColumnAlignment.Center)
+                        .withSourceValueEchoRendering()
+                        .withSourceValueEchoExcelOutput())
                 .withColumn(builder =>
                     builder
                         .withDataSourceName("ItSystemRightsHolderName")
@@ -316,7 +337,6 @@
                         .withSourceValueEchoRendering()
                         .withSourceValueEchoExcelOutput());
 
-
             //Launch kendo grid
             launcher.launch();
         }

Presentation.Web/app/helpers/RenderFieldsHelper.ts

@@ -14,16 +14,12 @@
 
         static renderReference(referenceTitle: string, referenceUrl: string) {
             if (referenceTitle === null || _.isUndefined(referenceTitle)) {
-                if (Utility.Validation.isValidExternalReference(referenceUrl)) {
-                    return `<a target="_blank" style="float:left;" href="${referenceUrl}">${referenceUrl}</a>`;
-                } else {
-                    return RenderFieldsHelper.noValueFallback;
-                }
+                referenceTitle = referenceUrl;
             }
             if (Utility.Validation.isValidExternalReference(referenceUrl)) {
                 return `<a target="_blank" style="float:left;" href="${referenceUrl}">${referenceTitle}</a>`;
             }
-            return referenceTitle;
+            return referenceTitle || this.noValueFallback;
         }
 
         static renderReferenceUrl(reference: Models.Reference.IOdataReference) {

Presentation.Web/app/models/it-system-usage/it-system-usage-overview-readmodel.ts

@@ -30,5 +30,8 @@
         ItSystemBusinessTypeId: number | null;
         ItSystemBusinessTypeName: string | null;
         ItSystemTaskRefs: IItSystemUsageOverviewTaskRefReadModel[];
+        LocalReferenceDocumentId: string | null;
+        LocalReferenceUrl: string | null;
+        LocalReferenceTitle: string | null;
     }
 }

Presentation.Web/app/utility/kendoGridLauncher.ts

@@ -35,6 +35,12 @@ module Kitos.Utility.KendoGrid {
         optionalContext?: any;
     }
 
+    export enum KendoColumnAlignment {
+        Left,
+        Right,
+        Center
+    }
+
     export interface IKendoGridColumnBuilder<TDataSource> {
         withId(id: string): IKendoGridColumnBuilder<TDataSource>;
         withDataSourceName(name: string): IKendoGridColumnBuilder<TDataSource>;
@@ -50,11 +56,11 @@ module Kitos.Utility.KendoGrid {
         withContentOverflow(): IKendoGridColumnBuilder<TDataSource>;
         withExcelOutput(excelOutput: (source: TDataSource) => string): IKendoGridColumnBuilder<TDataSource>;
         withSourceValueEchoExcelOutput(): IKendoGridColumnBuilder<TDataSource>;
+        withContentAlignment(alignment: KendoColumnAlignment): IKendoGridColumnBuilder<TDataSource>;
         build(): IExtendedKendoGridColumn<TDataSource>;
     }
 
     class KendoGridColumnBuilder<TDataSource> implements IKendoGridColumnBuilder<TDataSource> {
-
         private standardWidth: number = 200;
         private dataSourceName: string = null;
         private title: string = null;
@@ -69,6 +75,12 @@ module Kitos.Utility.KendoGrid {
         private visible = true;
         private dataSourceType: KendoGridColumnDataSourceType = null;
         private contentOverflow : boolean | null = null;
+        private contentAlignment : KendoColumnAlignment | null = null;
+
+        withContentAlignment(alignment: KendoColumnAlignment): IKendoGridColumnBuilder<TDataSource> {
+            this.contentAlignment = alignment;
+            return this;
+        }
 
         withContentOverflow(): IKendoGridColumnBuilder<TDataSource> {
             this.contentOverflow = true;
@@ -263,8 +275,28 @@ module Kitos.Utility.KendoGrid {
             const attributes = {
                 "data-element-type": `${this.id}KendoObject`
             };
+
+            const classes : string[] = [];
             if (this.contentOverflow) {
-                attributes["class"] = "might-overflow";
+                classes.push("might-overflow");
+            }
+            if (this.contentAlignment != null) {
+                switch (this.contentAlignment) {
+                    case KendoColumnAlignment.Left:
+                        classes.push("text-left");
+                        break;
+                    case KendoColumnAlignment.Right:
+                        classes.push("text-right");
+                        break;
+                    case KendoColumnAlignment.Center:
+                        classes.push("text-center");
+                    break;
+                    default:
+                        throw `Unsupported alignment type:${this.contentAlignment}`;
+                }
+            }
+            if (classes.length > 0) {
+                attributes["class"] = classes.join(" ");
             }
             return {
                 field: this.dataSourceName,