From 65bca4c0255546057c24db433edfc2cd61a65690 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 30 Jan 2020 14:48:20 +0100
Subject: [PATCH] Fix missing parts from merge commit

---
 api/js/etemplate/et2_core_widget.js |  2 +-
 timesheet/js/app.js                 | 44 ++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/api/js/etemplate/et2_core_widget.js b/api/js/etemplate/et2_core_widget.js
index 5edb3ef408..e111b1d65d 100644
--- a/api/js/etemplate/et2_core_widget.js
+++ b/api/js/etemplate/et2_core_widget.js
@@ -720,7 +720,7 @@ var et2_widget = /** @class */ (function (_super) {
      * Sets the client side api instance. It can be retrieved by the widget tree
      * by using the "egw()" function.
      *
-     * @param {egw} _egw egw object to set
+     * @param {IegwAppLocal} _egw egw object to set
      */
     et2_widget.prototype.setApiInstance = function (_egw) {
         this._egw = _egw;
diff --git a/timesheet/js/app.js b/timesheet/js/app.js
index 63bf2661ce..06ac07b75b 100644
--- a/timesheet/js/app.js
+++ b/timesheet/js/app.js
@@ -38,7 +38,9 @@ var egw_app_1 = require("../../api/js/jsapi/egw_app");
 var TimesheetApp = /** @class */ (function (_super) {
     __extends(TimesheetApp, _super);
     function TimesheetApp() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.appname = 'timesheet';
+        return _this;
     }
     /**
      * This function is called when the etemplate2 object is loaded
@@ -170,6 +172,46 @@ var TimesheetApp = /** @class */ (function (_super) {
         if (widget)
             return widget.options.value;
     };
+    /**
+     * Handle a push notification about entry changes from the websocket
+     *
+     * @param  pushData
+     * @param {string} pushData.app application name
+     * @param {(string|number)} pushData.id id of entry to refresh or null
+     * @param {string} pushData.type either 'update', 'edit', 'delete', 'add' or null
+     * - update: request just modified data from given rows.  Sorting is not considered,
+     *		so if the sort field is changed, the row will not be moved.
+     * - edit: rows changed, but sorting may be affected.  Requires full reload.
+     * - delete: just delete the given rows clientside (no server interaction neccessary)
+     * - add: requires full reload for proper sorting
+     * @param {object|null} pushData.acl Extra data for determining relevance.  eg: owner or responsible to decide if update is necessary
+     * @param {number} pushData.account_id User that caused the notification
+     */
+    TimesheetApp.prototype.push = function (pushData) {
+        var _a, _b, _c;
+        // timesheed does NOT care about other apps data
+        if (pushData.app !== this.appname)
+            return;
+        if (pushData.type === 'delete') {
+            return _super.prototype.push.call(this, pushData);
+        }
+        // all other cases (add, edit, update) are handled identical
+        // check visibility
+        if (typeof this._grants === 'undefined') {
+            this._grants = egw.grants(this.appname);
+        }
+        if (typeof this._grants[pushData.acl] === 'undefined')
+            return;
+        // check if we might not see it because of an owner filter
+        var nm = (_a = this.et2) === null || _a === void 0 ? void 0 : _a.getWidgetById('nm');
+        var nm_value = (_b = nm) === null || _b === void 0 ? void 0 : _b.getValue();
+        if (nm && nm_value && typeof ((_c = nm_value.col_filter) === null || _c === void 0 ? void 0 : _c.ts_owner) !== 'undefined') {
+            if (!nm_value.col_filter.ts_owner || nm_value.col_filter.ts_owner == pushData.acl) {
+                this.updateList(nm, pushData);
+            }
+        }
+    };
     return TimesheetApp;
 }(egw_app_1.EgwApp));
 app.classes.timesheet = TimesheetApp;
+//# sourceMappingURL=app.js.map
\ No newline at end of file