From 91cfbb0508212278682ab7c821ff071a7d1cdf4f Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <elmau@correolibre.net>
Date: Tue, 3 Aug 2021 20:08:57 -0500
Subject: [PATCH] Add column 'In branch' for users

---
 source/app/models/main.py            | 10 +++++++---
 source/static/js/controller/admin.js | 13 +++++++++++++
 source/static/js/ui/admin.js         |  4 +++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/source/app/models/main.py b/source/app/models/main.py
index d51c69b..656b259 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -3477,11 +3477,16 @@ class Sucursales(BaseModel):
                 Sucursales.serie_tickets,
                 Almacenes.name.alias('warehouse'),
             )
-            .join(Almacenes).switch(Sucursales)
+            .join(Almacenes, JOIN.LEFT_OUTER).switch(Sucursales)
             .dicts()
         )
         return tuple(rows)
 
+    @classmethod
+    def _get_there_are_branchs(cls, args):
+        result = bool(Sucursales.select().count())
+        return result
+
     @classmethod
     def get_data(cls, values):
         opt = values['opt']
@@ -3836,8 +3841,7 @@ class Productos(BaseModel):
                     Productos.descripcion,
                     SATUnidades.name.alias('unidad'),
                     Productos.valor_unitario)
-                .join(SATUnidades)
-                .switch(Productos)
+                .join(SATUnidades).switch(Productos)
                 .where((Productos.es_activo==True) &
                     ((Productos.descripcion.contains(name)) |
                     (Productos.clave.contains(name))))
diff --git a/source/static/js/controller/admin.js b/source/static/js/controller/admin.js
index 059502e..4ce3ac9 100644
--- a/source/static/js/controller/admin.js
+++ b/source/static/js/controller/admin.js
@@ -471,6 +471,19 @@ function get_admin_usuarios(){
         }
     })
 
+    webix.ajax().get('/sucursales', {'opt': 'there_are_branchs'}, {
+        error: function(text, data, xhr) {
+            msg = 'Error al consultar'
+            msg_error(msg)
+        },
+        success: function(text, data, xhr) {
+            var value = data.json()
+            if(value){
+                $$('grid_usuarios').showColumn('in_branch')
+            }
+        }
+    })
+
 }
 
 
diff --git a/source/static/js/ui/admin.js b/source/static/js/ui/admin.js
index d4a6a15..f3470bf 100644
--- a/source/static/js/ui/admin.js
+++ b/source/static/js/ui/admin.js
@@ -1,5 +1,5 @@
 //~ Empresa Libre
-//~ Copyright (C) 2016-2018  Mauricio Baeza Servin (web@correolibre.net)
+//~ Copyright (C) 2016-2021  Mauricio Baeza Servin (public@correolibre.net)
 //~
 //~ This program is free software: you can redistribute it and/or modify
 //~ it under the terms of the GNU General Public License as published by
@@ -1340,6 +1340,8 @@ var grid_usuarios_cols = [
         hidden: true},
     {id: 'ultimo_ingreso', header: 'Ultimo Ingreso', fillspace: 1,
         hidden: true},
+    {id: 'in_branch', header: 'En Sucursal', template: '{common.checkbox()}',
+        editor: 'checkbox', adjust: 'header', hidden: true},
     {id: 'es_activo', header: 'Activo', template: '{common.checkbox()}',
         editor: 'checkbox', adjust: 'header'},
     {id: 'es_admin', header: 'Es Admin', template: '{common.checkbox()}',