From 1253749931e3419b8001fcec732f482dc2b6e60b Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 13 Aug 2019 15:10:12 +0800
Subject: [PATCH] add xvfbrun to ssconvert

---
 GnumericToExcel.php      | 4 +++-
 Pman.Dialog.CoreEnum.bjs | 8 ++++----
 Pman.Dialog.CoreEnum.js  | 2 +-
 sql/core_person.sql      | 2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/GnumericToExcel.php b/GnumericToExcel.php
index 5b6e4714..cae40372 100644
--- a/GnumericToExcel.php
+++ b/GnumericToExcel.php
@@ -74,8 +74,10 @@ class Pman_Core_GnumericToExcel extends Pman
         
         
         require_once 'System.php';
+        $xvfb = System::which('xvfb-run');
+        
         $ss = System::which('ssconvert');
-        $cmd =  $ss. 
+        $cmd = $xvfb . " -a " . $ss. 
                 " --import-encoding=Gnumeric_XmlIO:sax" .
                 " --export-type=Gnumeric_Excel:excel_biff8 " . 
                 $srcTmp . ' ' . $targetTmp . ' 2>&1';
diff --git a/Pman.Dialog.CoreEnum.bjs b/Pman.Dialog.CoreEnum.bjs
index 2f6fbd7a..a13189f0 100644
--- a/Pman.Dialog.CoreEnum.bjs
+++ b/Pman.Dialog.CoreEnum.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.CoreEnum",
  "parent" : "",
  "title" : "",
- "path" : "/home/edward/gitlive/Pman.Core/Pman.Dialog.CoreEnum.bjs",
+ "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreEnum.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -45,9 +45,9 @@
      "* prop" : "center"
     },
     {
+     "fitToFrame" : true,
      "background" : true,
      "region" : "center",
-     "fitToFrame" : true,
      "xtype" : "ContentPanel",
      "$ xns" : "Roo",
      "items" : [
@@ -57,8 +57,8 @@
         "|rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/core_enum.php'",
-       "xtype" : "Form",
        "method" : "POST",
+       "xtype" : "Form",
        "style" : "margin: 5px",
        "$ xns" : "Roo.form",
        "items" : [
@@ -79,7 +79,7 @@
          "fieldLabel" : "Display Name",
          "xtype" : "TextField",
          "allowBlank" : false,
-         "width" : 200,
+         "width" : 250,
          "$ xns" : "Roo.form",
          "name" : "display_name"
         },
diff --git a/Pman.Dialog.CoreEnum.js b/Pman.Dialog.CoreEnum.js
index 44bd69bf..273763ab 100644
--- a/Pman.Dialog.CoreEnum.js
+++ b/Pman.Dialog.CoreEnum.js
@@ -180,7 +180,7 @@ Pman.Dialog.CoreEnum = {
           allowBlank : false,
           fieldLabel : _this._strings['b48968e1c912da07df5e8d6d246291ec'] /* Display Name */,
           name : 'display_name',
-          width : 200,
+          width : 250,
           listeners : {
            keyup : function (_self, e)
             {
diff --git a/sql/core_person.sql b/sql/core_person.sql
index 3ef5cf16..2044aade 100644
--- a/sql/core_person.sql
+++ b/sql/core_person.sql
@@ -106,3 +106,5 @@ ALTER TABLE core_person ADD COLUMN post_code VARCHAR(256) NOT NULL DEFAULT '';
 ALTER TABLE core_person ADD COLUMN oath_key VARCHAR(254) NOT NULL DEFAULT ''; 
 
 alter table core_person add index lookup_company_id( company_id);
+-- update core_person set email = CONCAT(id,'@fake.email') where email = '';
+-- alter table core_person add unique index company_email( company_id, email );
-- 
2.39.2