change

wwwroot/apps/hrms/components/attendence.js

@@ -809,7 +809,11 @@ var Bizgaze;
                     afterload() {
                         const instance = Bizgaze.Apps.Hrms.Components.Attendence.Instance();
                         instance.log_data = Unibase.Platform.Membership.Infos.Identity.getCurrentUser();
-                        let started_time = instance.log_data.settings.filter(function (o) { return o.settingName === "checkin"; })[0].settingValue;
+                        let started_time = "";
+                        let _checkin = instance.log_data.settings.filter(function (o) { return o.settingName === "checkin"; });
+                        if (_checkin.length != 0) {
+                            started_time = _checkin[0].settingValue;
+                        }
                         instance.employeeid = instance.log_data.userId;
                         Bizgaze.Apps.Hrms.Managers.AttendenceManager.Instance().getLoginDetails(instance.employeeid).then(function (response) {
                             if (started_time != '') {

wwwroot/platform/analytics/components/reportbuilder/reportbuilder.template.js

@@ -47,10 +47,10 @@ var Unibase;
                     loadToolTipColumn(ColumnId, AliasName, DataType, DisplayText) {
                         let tooltipHtml = `<div class="dsl-block datagroup inline-edit" id="dsl_tool_column_${AliasName}">
                                             <span>
-												<i class="las la-braille dragger"></i>
+												<i class="las la-braille dragger hidden"></i>
-                                            <div class="dsl-block-name">
+                                            <div class="dsl-block-name position-relative flex-grow-1 mw-100">
                                             <input type="text" id="txttooltipedit" required="required" value="${DisplayText}" class="edit text-truncate" disabled>
-                                            <button type="reset" title="Click me to clear the input field" class="reset-text font-18 hidden" onclick ="Unibase.Platform.Analytics.Charts.ChartBuilder.Instance().toolTipEdit('${AliasName}')">&times;</button>
+                                            <button type="reset" title="Click me to clear the input field" class="btn btn-icon btn-flush-biz-theme btn-rounded flush-soft-hover d-20 reset-text hidden reset-text hidden" onclick ="Unibase.Platform.Analytics.Charts.ChartBuilder.Instance().toolTipEdit('${AliasName}')"><span class="btn-icon-wrap"><i class="icon dripicons-cross"></i></span></button>
                                             </div>
                                                 </span>
                                                 <span>

wwwroot/platform/analytics/components/reportbuilder/style.reportbuilder.css

@@ -130,11 +130,6 @@
 
 /*Tooltip text clear btn*/
 
-#tooltip_selected_columns .dsl-block-name {
-    position: relative;
-    width: 400px;
-}
-
     #tooltip_selected_columns .dsl-block-name input {
         width: 100%;
         background: transparent;
@@ -165,13 +160,12 @@
 
     #tooltip_selected_columns .dsl-block-name button[type="reset"] {
         position: absolute;
-        top: 2px;
+        top: 50%;
-        bottom: 2px;
+        transform: translateY(-50%);
-        right: 2px;
+        right: 4px;
         color: #666;
         border: 0;
         display: none;
-        padding: 0 4px;
         border-radius: 50%;
         transition: background 200ms;
         background: transparent;

wwwroot/tenants/themes/compact/components/details/details.js

@@ -1433,7 +1433,7 @@ var Unibase;
                                         html += '<div class="portletwidget-item mb-sm-20 ' + Width + ' ' + sorting + ' portletwidget-addeditem ' + hidden + ' portletwidget-' + model.PortletWidgetId + ' widgetItem-' + model.PortletWidgetId + ' widgetid-' + model.WidgetId + '" id="' + model.WidgetId + '" data-portletwidgetid="" data-widgetid="' + model.WidgetId + '" data-strctwidgetindex="' + model.StrctWidgetIndex + '" data-portletid="' + model.PortletId + '" data-widgetname="' + model.WidgetName + '"><div class="Border"><div class="Border1 hidden"><div class="dragWidget dargwidget-' + model.WidgetId + ' pull-left" id="dragWidget"><a class="btn btn-icon btn-rounded btn-flush-primary flush-soft-hover"><span class="btn-icon-wrap"><i class="ti-fullscreen"></i></span></a></div><div class="card-action-wrap editwidget editwidget-' + model.WidgetId + ' pull-right m-t-sm m-r-lg" id="editwidget"><a href="javascript:;" class="inline-block btn btn-icon btn-rounded btn-flush-primary flush-soft-hover" title="Edit Widget" onclick="Unibase.Platform.Helpers.FileCacheHelper.Instance().loadJsFile(\'platform/widgets/components/widget.js\',function () {Unibase.Platform.Widgets.Components.Widget.Instance().loadWidgetData(' + model.WidgetId + ',' + installedappid + ', true,' + model.PortletWidgetId + ');});"><span class="btn-icon-wrap"><i class="ti-pencil" id = "EditWidget-' + model.PortletWidgetId + '"></i></span></a><a href = "javascript:;" class="btn btn-icon btn-rounded btn-flush-primary flush-soft-hover" title="Permissions" onclick = "Unibase.Themes.Compact.Components.Details.Instance().ShowWidgetPermissions(' + model.PortletWidgetId + ')";><span class="btn-icon-wrap"><i class="ti-key"></i></span></a><a href="javascript:;" class="btn btn-icon btn-rounded btn-flush-primary flush-soft-hover" title="delete widget" onclick="Unibase.Platform.Widgets.Components.Widget.Instance().deletePortletWidgets(' + model.PortletWidgetId + ')"><span class="btn-icon-wrap"><i class="ti-trash"></i></span></a><a href="javascript:;" title = "Export Widget" onclick = "Unibase.Platform.Widgets.Components.Widget.Instance().exportWidgetByWidgetId(' + model.WidgetId + ')" > <i class="fa fa-download text-info mr-2" id = "ExportWidget-' + model.PortletWidgetId + '" > </i></a ></div></div><input type="hidden" id="hf_PortletWidgetId" value="' + model.PortletWidgetId + '" /><input type="hidden" id="hf_widgetId" value="' + model.WidgetId + '" /><input type="hidden" id="hf_ReportId" value="' + model.ReportId + '" /><input type = "hidden" id = "hf_widgetName_' + model.PortletWidgetId + '" value = "' + WidgetName + '" /><div class="" id="editWidgetData-' + model.PortletWidgetId + '" /></div><div class="cardbody rounded-4">';
                                     }
                                     if (model.WidgetLayoutName == 'KPI' || model.WidgetLayoutName == 'Detail') {
-                                        html += '<div class="bg-white d-block h-90p line-loader position-relative"></div><div class="hidden div_portletwidget_' + model.PortletWidgetId + "_" + panel.replace("#", "") + '" id="div_portletwidget_' + model.PortletWidgetId + "_" + panel.replace("#", "") + '"  data-widgetid="' + model.WidgetId + '"></div></div></div></div>';
+                                        html += '<div class="bg-white d-block h-90p line-loader position-relative div_LineLoader"></div><div class="hidden div_portletwidget_' + model.PortletWidgetId + "_" + panel.replace("#", "") + '" id="div_portletwidget_' + model.PortletWidgetId + "_" + panel.replace("#", "") + '"  data-widgetid="' + model.WidgetId + '"></div></div></div></div>';
                                     }
                                     else {
                                         html += '<div class="div_portletwidget_' + model.PortletWidgetId + "_" + panel.replace("#", "") + '" id="div_portletwidget_' + model.PortletWidgetId + "_" + panel.replace("#", "") + '"  data-widgetid="' + model.WidgetId + '"></div></div></div></div>';

wwwroot/tenants/themes/compact/components/nav/nav.js

@@ -2295,12 +2295,14 @@ var Unibase;
                     _bindtenants_data() {
                         Unibase.Platform.Membership.Managers.AccountManager.Instance().getSharedTenants().then(function (result) {
                             $("#selectbranch").empty();
-                            let data = result.result;
+                            if (result != "") {
-                            for (var i = 0; i < data.length; i++) {
+                                let data = result.result;
-                                var primary_tenant = data[i].tenantName;
+                                for (var i = 0; i < data.length; i++) {
-                                var primary_tenant_id = data[i].tenantId;
+                                    var primary_tenant = data[i].tenantName;
-                                var html = `<option class="primary-account font-10" value =` + primary_tenant_id + `> ` + primary_tenant + ` </option>`;
+                                    var primary_tenant_id = data[i].tenantId;
-                                $("#selectbranch").append(html);
+                                    var html = `<option class="primary-account font-10" value =` + primary_tenant_id + `> ` + primary_tenant + ` </option>`;
+                                    $("#selectbranch").append(html);
+                                }
                             }
                             let branch_selct = $("#selectbranch").find("option").length;
                             if (branch_selct <= 1) {
@@ -2417,6 +2419,9 @@ var Unibase;
                     _isSwitched() {
                         let _currentTenant = _appsettings.active_identity().tenantId;
                         let _switchedTenant = $('#selectbranch').find(":selected").val();
+                        if (_switchedTenant == undefined) {
+                            return false;
+                        }
                         return _currentTenant != Number(_switchedTenant);
                     }
                     changeBranch() {

wwwroot/tenants/themes/compact/widgets/detailwidgets/default.js

@@ -109,6 +109,10 @@ var Unibase;
                     }
                     loadData(portletwidgetid, detailContainer, parameters, IsPreview, response, portletresponse) {
                         let instance = this, list1 = '', list2 = '', count = 0, labelArray1 = [], labelArray2 = [];
+                        if (response.errors != null && response.errors.length > 0) {
+                            $("." + detailContainer).parent().find(".div_LineLoader").before(`<div id="Bizgaze-messageInfo" class="alert alert-danger mb-0 details_ErrorMsg"><strong>Error! </strong>` + response.message + `</div>`).removeClass("line-loader");
+                            return false;
+                        }
                         var result = response.result.Data;
                         var cssproperty;
                         if (portletresponse != undefined) {

wwwroot/tenants/themes/compact/widgets/detailwidgets/detailwidgetsplitcolumn.js

@@ -57,6 +57,10 @@ var Unibase;
                         debugger;
                         var instance = this;
                         Unibase.Platform.Widgets.Managers.WidgetManager.Instance().getDetailWidgetData(parameters).then(function (result) {
+                            if (result.errors != null && result.errors.length > 0) {
+                                $("." + detailcontainer).parent().find(".div_LineLoader").before(`<div id="Bizgaze-messageInfo" class="alert alert-danger mb-0 details_ErrorMsg"><strong>Error! </strong>` + result.message + `</div>`).removeClass("line-loader");
+                                return false;
+                            }
                             var properties = result.result.DetailWidgetProperties;
                             var tokenarray = [];
                             var propertyarray = [];

wwwroot/tenants/themes/compact/widgets/detailwidgets/singlecolumn.js

@@ -101,6 +101,10 @@ var Unibase;
                     loadData(portletwidgetid, detailContainer, parameters, IsPreview, result, portletresponse) {
                         detailContainer = '.' + detailContainer;
                         var instance = this, list = '', labelArray1 = [];
+                        if (result.errors != null && result.errors.length > 0) {
+                            $(detailContainer).parent().find(".div_LineLoader").before(`<div id="Bizgaze-messageInfo" class="alert alert-danger mb-0 details_ErrorMsg"><strong>Error! </strong>` + result.message + `</div>`).removeClass("line-loader");
+                            return false;
+                        }
                         var properties = result.result.DetailWidgetProperties;
                         var cssproperty;
                         if (portletresponse != undefined) {

wwwroot/tenants/themes/compact/widgets/detailwidgets/singlecolumn_noborder.js

@@ -101,6 +101,10 @@ var Unibase;
                     loadData(portletwidgetid, detailContainer, parameters, IsPreview, result, portletresponse) {
                         detailContainer = '.' + detailContainer;
                         var instance = this, list = '', labelArray1 = [];
+                        if (result.errors != null && result.errors.length > 0) {
+                            $(detailContainer).parent().find(".div_LineLoader").before(`<div id="Bizgaze-messageInfo" class="alert alert-danger mb-0 details_ErrorMsg"><strong>Error! </strong>` + result.message + `</div>`).removeClass("line-loader");
+                            return false;
+                        }
                         var properties = result.result.DetailWidgetProperties;
                         var cssproperty;
                         if (portletresponse != undefined) {

wwwroot/tenants/themes/compact/widgets/detailwidgets/singledata.js

@@ -78,6 +78,10 @@ var Unibase;
                     loadData(portletwidgetid, detailContainer, parameters, IsPreview, result, portletresponse) {
                         detailContainer = '.' + detailContainer;
                         var instance = this;
+                        if (result.errors != null && result.errors.length > 0) {
+                            $(detailContainer).parent().find(".div_LineLoader").before(`<div id="Bizgaze-messageInfo" class="alert alert-danger mb-0 details_ErrorMsg"><strong>Error! </strong>` + result.message + `</div>`).removeClass("line-loader");
+                            return false;
+                        }
                         var properties = result.result.DetailWidgetProperties;
                         var cssproperty;
                         if (portletresponse != undefined) {