|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14936] Syncromind: Merge 14933:14935 from trunk |
| Date: | Mon, 25 Apr 2016 16:40:07 +0000 |
Revision: 14936
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14936
Author: sigurdne
Date: 2016-04-25 16:40:07 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
Syncromind: Merge 14933:14935 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/phpgwapi/setup/setup.inc.php
branches/dev-syncromind-2/phpgwapi/setup/tables_current.inc.php
branches/dev-syncromind-2/phpgwapi/setup/tables_update.inc.php
branches/dev-syncromind-2/property/inc/class.menu.inc.php
Added Paths:
-----------
branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php
branches/dev-syncromind-2/property/templates/base/generic_document.xsl
Property Changed:
----------------
branches/dev-syncromind-2/
Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935
Modified: branches/dev-syncromind-2/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind-2/phpgwapi/setup/setup.inc.php 2016-04-25
16:37:42 UTC (rev 14935)
+++ branches/dev-syncromind-2/phpgwapi/setup/setup.inc.php 2016-04-25
16:40:07 UTC (rev 14936)
@@ -12,7 +12,7 @@
// Basic information about this app
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi';
- $setup_info['phpgwapi']['version'] = '0.9.17.549';
+ $setup_info['phpgwapi']['version'] = '0.9.17.550';
$setup_info['phpgwapi']['versions']['current_header'] = '1.31';
$setup_info['phpgwapi']['versions']['system'] = '2.0';
$setup_info['phpgwapi']['enable'] = 3;
@@ -64,6 +64,7 @@
'phpgw_sessions',
'phpgw_vfs',
'phpgw_vfs_filedata',
+ 'phpgw_vfs_file_relation',
'phpgw_config2_section',
'phpgw_config2_attrib',
'phpgw_config2_choice',
Modified: branches/dev-syncromind-2/phpgwapi/setup/tables_current.inc.php
===================================================================
--- branches/dev-syncromind-2/phpgwapi/setup/tables_current.inc.php
2016-04-25 16:37:42 UTC (rev 14935)
+++ branches/dev-syncromind-2/phpgwapi/setup/tables_current.inc.php
2016-04-25 16:40:07 UTC (rev 14936)
@@ -309,7 +309,23 @@
'ix' => array(),
'uc' => array()
),
-
+ 'phpgw_vfs_file_relation' => array(
+ 'fd' => array(
+ 'relation_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'file_id' => array('type'
=> 'int','precision' => '4','nullable' => False),
+ 'location_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'location_item_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'is_private' => array('type' =>
'int','precision' => '2','nullable' => False),
+ 'account_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'entry_date' => array('type' =>
'int','precision' => '8','nullable' => False),
+ 'start_date' => array('type' =>
'int','precision' => '8','nullable' => False),
+ 'end_date' => array('type'
=> 'int','precision' => '8 ','nullable' => False),
+ ),
+ 'pk' => array('relation_id'),
+ 'fk' => array('phpgw_vfs' => array('file_id' =>
'file_id')),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
'phpgw_history_log' => array(
'fd' => array(
'history_id' => array('type' =>
'auto','precision' => 4,'nullable' => False),
Modified: branches/dev-syncromind-2/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/dev-syncromind-2/phpgwapi/setup/tables_update.inc.php
2016-04-25 16:37:42 UTC (rev 14935)
+++ branches/dev-syncromind-2/phpgwapi/setup/tables_update.inc.php
2016-04-25 16:40:07 UTC (rev 14936)
@@ -3324,3 +3324,38 @@
}
}
+ $test[] = '0.9.17.549';
+ /**
+ * Add table for file relation to multiple items
+ * @return string the new version number
+ */
+ function phpgwapi_upgrade0_9_17_549()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_vfs_file_relation',array(
+ 'fd' => array(
+ 'relation_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'file_id' => array('type'
=> 'int','precision' => '4','nullable' => False),
+ 'location_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'location_item_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'is_private' => array('type' =>
'int','precision' => '2','nullable' => False),
+ 'account_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'entry_date' => array('type' =>
'int','precision' => '8','nullable' => False),
+ 'start_date' => array('type' =>
'int','precision' => '8','nullable' => False),
+ 'end_date' => array('type'
=> 'int','precision' => '8 ','nullable' => False),
+ ),
+ 'pk' => array('relation_id'),
+ 'fk' => array('phpgw_vfs' => array('file_id' =>
'file_id')),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.550';
+ return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ }
+ }
Modified: branches/dev-syncromind-2/property/inc/class.menu.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.menu.inc.php 2016-04-25
16:37:42 UTC (rev 14935)
+++ branches/dev-syncromind-2/property/inc/class.menu.inc.php 2016-04-25
16:40:07 UTC (rev 14936)
@@ -1225,6 +1225,10 @@
'image' => array('property',
'documentation'),
'children' => array
(
+ 'generic' => array(
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric_document.index')),
+ 'text' => lang('generic
document')
+ ),
'legislation' => array
(
'text' =>
$GLOBALS['phpgw']->translation->translate('laws and regulations', array(),
true),
Copied: branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php
(from rev 14935, trunk/property/inc/class.uigeneric_document.inc.php)
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php
(rev 0)
+++ branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php
2016-04-25 16:40:07 UTC (rev 14936)
@@ -0,0 +1,878 @@
+<?php
+ /**
+ * phpGroupWare - property: a part of a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/
+ * @package property
+ * @subpackage logistic
+ * @version $Id: class.uigeneric_document.inc.php 14913 2016-04-11
12:27:37Z sigurdne $
+ */
+ phpgw::import_class('phpgwapi.uicommon_jquery');
+ phpgw::import_class('phpgwapi.jquery');
+
+ class property_uigeneric_document extends phpgwapi_uicommon_jquery
+ {
+
+ private $bo;
+ private $receipt = array();
+ public $public_functions = array(
+ 'query' => true,
+ 'index' => true,
+ 'view' => true,
+ 'add' => true,
+ 'edit' => true,
+ 'save' => true,
+ 'delete' => true,
+ 'get_vendors' => true,
+ 'get_users' => true,
+ 'edit_title' => true,
+ 'get_relations' => true,
+ 'view_file' => true,
+ 'download' => true,
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+
+// $this->bo =
CreateObject('property.bogeneric_document');∕∕create me...
+ $this->bocommon = & $this->bo->bocommon;
+ $this->acl = & $GLOBALS['phpgw']->acl;
+ $this->acl_location =
'.document';//$this->bo->acl_location;
+ $this->acl_read =
$this->acl->check($this->acl_location, PHPGW_ACL_READ, 'property');
+ $this->acl_add = $this->acl->check($this->acl_location,
PHPGW_ACL_ADD, 'property');
+ $this->acl_edit =
$this->acl->check($this->acl_location, PHPGW_ACL_EDIT, 'property');
+ $this->acl_delete =
$this->acl->check($this->acl_location, PHPGW_ACL_DELETE, 'property');
+ $this->acl_manage =
$this->acl->check($this->acl_location, 16, 'property');
+
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"property::documentation::generic";
+ }
+
+ public function download()
+ {
+ if (!$this->acl_read)
+ {
+ phpgw::no_access();
+ return;
+ }
+
+ $values = $this->query();
+
+ $descr = array();
+ $columns = array();
+ $columns[] = 'id';
+ $columns[] = 'title';
+ $columns[] = 'descr';
+ $columns[] = 'address';
+ $columns[] = 'cnt';
+
+ foreach ($columns as $_column)
+ {
+ $descr[] = lang(str_replace('_', ' ',
$_column));
+ }
+
+ $this->bocommon->download($values, $columns, $descr);
+ }
+
+ /**
+ * Prepare UI
+ * @return void
+ */
+ public function index()
+ {
+ if (!$this->acl_read)
+ {
+ phpgw::no_access();
+ return;
+ }
+
+ if (phpgw::get_var('phpgw_return_as') == 'json')
+ {
+ return $this->query();
+ }
+
+ self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
+ self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
+
+ $categories = $this->_get_categories();
+
+ $data = array(
+ 'datatable_name' => lang('generic document'),
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array(
+ array('type' =>
'filter',
+ 'name' =>
'cat_id',
+ 'text' =>
lang('category') . ':',
+ 'list' =>
$categories,
+ )
+ ),
+ ),
+ ),
+ 'datatable' => array(
+ 'source' =>
self::link(array('menuaction' => 'property.uigeneric_document.index',
+ 'phpgw_return_as' => 'json')),
+ 'download' =>
self::link(array('menuaction' => 'property.uigeneric_document.download',
+ 'export' => true, 'allrows' =>
true)),
+ 'new_item' =>
self::link(array('menuaction' => 'property.uigeneric_document.add')),
+ 'allrows' => true,
+ 'editor_action' =>
self::link(array('menuaction' => 'property.uigeneric_document.edit_title')),
+ 'field' => array(
+ array(
+ 'key' => 'id',
+ 'label' => lang('ID'),
+ 'sortable' => true,
+ 'formatter' =>
'JqueryPortico.formatLink'
+ ),
+ array(
+ 'key' => 'title',
+ 'label' =>
lang('title'),
+ 'sortable' => true,
+ 'editor' => true
+ ),
+ /*
array(
+ 'key' => 'descr',
+ 'label' =>
lang('description'),
+ 'sortable' => false,
+ ), */
+ array(
+ 'key' => 'address',
+ 'label' =>
lang('buildingname'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' => 'vendor',
+ 'label' =>
lang('vendor'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' => 'year',
+ 'label' => lang('year'),
+ 'sortable' => true,
+ 'className' => 'center'
+ ),
+ array(
+ 'key' => 'multiplier',
+ 'label' =>
lang('multiplier'),
+ 'sortable' => false,
+ 'className' => 'right'
+ ),
+ array(
+ 'key' => 'cnt',
+ 'label' =>
lang('count'),
+ 'sortable' => false,
+ 'className' => 'center'
+ ),
+ array(
+ 'key' => 'link',
+ 'label' => 'dummy',
+ 'sortable' => false,
+ 'hidden' => true,
+ )
+ )
+ ),
+ );
+
+ $parameters = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ ),
+ )
+ );
+
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'view_document',
+ 'text' => lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'property.uigeneric_document.view'
+ )),
+ 'parameters' => json_encode($parameters)
+ );
+
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'edit_document',
+ 'text' => lang('edit'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'property.uigeneric_document.edit'
+ )),
+ 'parameters' => json_encode($parameters)
+ );
+
+
+ if ($GLOBALS['phpgw']->acl->check('.admin',
PHPGW_ACL_DELETE, 'property'))
+ {
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'delete_document',
+ 'text' => lang('delete'),
+ 'confirm_msg' => lang('do you really
want to delete this entry') . '?',
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'property.uigeneric_document.delete'
+ )),
+ 'parameters' => json_encode($parameters)
+ );
+ }
+
+ self::render_template_xsl('datatable_jquery', $data);
+ }
+
+ /**
+ * Fetch data from $this->bo based on parametres
+ * @return array
+ */
+ public function query()
+ {
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+
+
+ $params = array(
+ 'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
+ 'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
+ 'query' => $search['value'],
+ 'sort' => phpgw::get_var('sort'),
+ 'dir' => phpgw::get_var('dir'),
+ 'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ );
+
+ $result_objects = array();
+ $result_count = 0;
+
+ $values = array(); //$this->bo->read($params);
+ if (phpgw::get_var('export', 'bool'))
+ {
+ return $values;
+ }
+
+ $result_data = array('results' => $values);
+
+ $result_data['total_records'] =
$this->bo->total_records;
+ $result_data['draw'] = $draw;
+
+ array_walk($result_data['results'], array($this,
'_add_links'), array('menuaction' => 'property.uigeneric_document.view'));
+
+ return $this->jquery_results($result_data);
+ }
+
+ public function view()
+ {
+ if (!$this->acl_read)
+ {
+ phpgw::no_access();
+ return;
+ }
+ $this->edit(null, $mode = 'view');
+ }
+
+ public function add()
+ {
+ $this->edit();
+ }
+
+ /**
+ * Prepare data for view and edit - depending on mode
+ *
+ * @param array $values populated object in case of retry
+ * @param string $mode edit or view
+ * @param int $id entity id - no id means 'new'
+ *
+ * @return void
+ */
+ public function edit( $values = array(), $mode = 'edit' )
+ {
+ $id = isset($values['id']) && $values['id'] ?
$values['id'] : phpgw::get_var('id', 'int');
+
+ if (!$this->acl_add && !$this->acl_edit)
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'property.uigeneric_document.view',
+ 'id' => $id));
+ }
+
+ if ($mode == 'view')
+ {
+ if (!$this->acl_read)
+ {
+ phpgw::no_access();
+ return;
+ }
+ }
+ else
+ {
+ if (!$this->acl_add && !$this->acl_edit)
+ {
+ phpgw::no_access();
+ return;
+ }
+ }
+
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('generic'),
'link' => '#generic');
+ $active_tab = 'generic';
+ $tabs['relations'] = array('label' =>
lang('relations'), 'link' => "#relations",
+ 'disable' => 0);
+
+ if ($id)
+ {
+ $tabs['relations']['link'] = '#relations';
+ $tabs['relations']['disable'] = 0;
+
+ if (!$values)
+ {
+ $values =
array();//$this->bo->read_single(array('id' => $id, 'view' => $mode == 'view'));
+ }
+ }
+
+ $categories = $this->_get_categories($values['cat_id']);
+
+ self::message_set($this->receipt);
+
+ $related_def = array
+ (
+ array('key' => 'name', 'label' => lang('name'),
'sortable' => false,
+ 'resizeable' => true),
+ array('key' => 'relate', 'label' =>
lang('related'), 'sortable' => false,
+ 'resizeable' => true),
+ );
+
+
+ $datatable_def = array();
+ $datatable_def[] = array
+ (
+ 'container' => 'datatable-container_0',
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uigeneric_document.get_relations',
+ 'id' => $id, 'phpgw_return_as'
=> 'json'))),
+ 'ColumnDefs' => $related_def,
+ 'config' => array(
+ array('disableFilter' => true)
+ )
+ );
+
+ $data = array
+ (
+ 'datatable_def' => $datatable_def,
+ 'document' => $values,
+ 'lang_coordinator' => lang('coordinator'),
+ 'categories' => array('options' => $categories),
+ 'status_list' => array('options' => array('id'
=> 1, 'name' => 'status_1')),
+ 'editable' => $mode == 'edit',
+ 'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
+ 'location_filter' => array('options' =>
$this->get_location_filter()),
+ 'link_controller_example' =>
self::link(array('menuaction' => 'controller.uicomponent.index'))
+ );
+
+ //print_r($data['tabs']); die;
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . '::' . lang('generic document');
+
+ if ($mode == 'edit')
+ {
+
$GLOBALS['phpgw']->jqcal->add_listener('report_date');
+ phpgwapi_jquery::load_widget('core');
+ self::add_javascript('property', 'portico',
'generic_document_edit.js');
+
phpgwapi_jquery::formvalidator_generate(array('date', 'security','file'));
+ }
+
+ phpgwapi_jquery::load_widget('numberformat');
+ self::add_javascript('property', 'portico',
'generic_document.js');
+
+ self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+
+ self::render_template_xsl(array('generic_document',
'datatable_inline'), $data);
+ }
+
+
+ private function get_location_filter()
+ {
+ $this->soadmin_entity =
CreateObject('property.soadmin_entity');
+ $entity_list =
$this->soadmin_entity->read(array('allrows' => true));
+ $location_filter = array();
+ foreach ($entity_list as $entry)
+ {
+ $categories =
$this->soadmin_entity->read_category(array('entity_id' => $entry['id'],
+ 'order' => 'name', 'sort' => 'asc',
'enable_controller' => true, 'allrows' => true));
+ foreach ($categories as $category)
+ {
+ $location_filter[] = array(
+ 'id' =>
$category['location_id'],
+ 'name' =>
"{$entry['name']}::{$category['name']}",
+ );
+ }
+ }
+
+ foreach ($location_filter as &$location)
+ {
+ $location['selected'] = $location['id'] ==
$location_id ? 1 : 0;
+ }
+ return $location_filter;
+ }
+
+
+ /**
+ * Saves an entry to the database for new/edit - redirects to
view
+ *
+ * @param int $id entity id - no id means 'new'
+ *
+ * @return void
+ */
+ public function save()
+ {
+ if (!$_POST)
+ {
+ return $this->edit();
+ }
+
+ $id = (int)phpgw::get_var('id');
+
+ if ($id)
+ {
+ $values =
array();//$this->bo->read_single(array('id' => $id, 'view' => true));
+ }
+ else
+ {
+ $values = array();
+ }
+
+ /*
+ * Overrides with incoming data from POST
+ */
+ $values = $this->_populate($values);
+
+ if ($this->receipt['error'])
+ {
+ $this->edit($values);
+ }
+ else
+ {
+
+ try
+ {
+ $id = $this->bo->save($values);
+ }
+ catch (Exception $e)
+ {
+ if ($e)
+ {
+
phpgwapi_cache::message_set($e->getMessage(), 'error');
+ $this->edit($values);
+ return;
+ }
+ }
+
+ $this->_handle_files($id);
+ if ($_FILES['import_file']['tmp_name'])
+ {
+ $this->_handle_import($id);
+ }
+ else
+ {
+ phpgwapi_cache::message_set('ok!',
'message');
+ self::redirect(array('menuaction' =>
'property.uigeneric_document.edit',
+ 'id' => $id));
+ }
+ }
+ }
+
+ /**
+ * Fetch a list of files to be displayed in view/edit
+ *
+ * @param int $id entity id
+ *
+ * @return array $ResultSet json resultset
+ */
+ public function get_relations()
+ {
+ if (!$this->acl_read)
+ {
+ return;
+ }
+
+
+ $values = array();
+ $values[] = array(
+ 'name' => 'Item 1',
+ 'relate' => '<input type="checkbox"
checked="checked">',
+ );
+ $values[] = array(
+ 'name' => 'Item 2',
+ 'relate' => '<input type="checkbox">',
+ );
+
+ return array(
+ 'recordsTotal' => count($values),
+ 'recordsFiltered' => count($values),
+ 'draw' => phpgw::get_var('draw', 'int'),
+ 'data' => $values,
+ );
+ }
+
+
+ /**
+ * Dowloads a single file to the browser
+ *
+ * @param int $id entity id
+ *
+ * @return file
+ */
+ function view_file()
+ {
+ if (!$this->acl_read)
+ {
+ return lang('no access');
+ }
+ ExecMethod('property.bofiles.get_file',
phpgw::get_var('file_id', 'int'));
+ }
+
+ /**
+ * Store and / or delete files related to an entity
+ *
+ * @param int $id entity id
+ *
+ * @return void
+ */
+ private function _handle_files( $id )
+ {
+ $id = (int)$id;
+ if (!$id)
+ {
+ throw new
Exception('uigeneric_document::_handle_files() - missing id');
+ }
+ $bofiles = CreateObject('property.bofiles');
+
+ if (isset($_POST['file_action']) &&
is_array($_POST['file_action']))
+ {
+
$bofiles->delete_file("/generic_document/{$id}/",array('file_action' =>
$_POST['file_action']));
+ }
+ $file_name = str_replace(' ', '_',
$_FILES['file']['name']);
+
+ if ($file_name)
+ {
+ if (!is_file($_FILES['file']['tmp_name']))
+ {
+
phpgwapi_cache::message_set(lang('Failed to upload file !'), 'error');
+ return;
+ }
+
+ $to_file = $bofiles->fakebase .
'/generic_document/' . $id . '/' . $file_name;
+ if ($bofiles->vfs->file_exists(array(
+ 'string' => $to_file,
+ 'relatives' =>
Array(RELATIVE_NONE)
+ )))
+ {
+ phpgwapi_cache::message_set(lang('This
file already exists !'), 'error');
+ }
+ else
+ {
+
$bofiles->create_document_dir("generic_document/{$id}");
+ $bofiles->vfs->override_acl = 1;
+
+ if (!$bofiles->vfs->cp(array(
+ 'from' =>
$_FILES['file']['tmp_name'],
+ 'to' => $to_file,
+ 'relatives' =>
array(RELATIVE_NONE | VFS_REAL, RELATIVE_ALL))))
+ {
+
phpgwapi_cache::message_set(lang('Failed to upload file !'), 'error');
+ }
+ $bofiles->vfs->override_acl = 0;
+ }
+ }
+ }
+
+
+ /**
+ * Gets user candidates to be used as coordinator - called as
ajax from edit form
+ *
+ * @param string $query
+ *
+ * @return array
+ */
+ public function get_users()
+ {
+ if (!$this->acl_read)
+ {
+ return;
+ }
+
+ $query = phpgw::get_var('query');
+
+ $accounts =
$GLOBALS['phpgw']->accounts->get_list('accounts', $start, $sort, $order,
$query, $offset);
+
+ $values = array();
+ foreach ($accounts as $account)
+ {
+ if ($account->enabled)
+ {
+ $values[] = array
+ (
+ 'id' => $account->id,
+ 'name' =>
$account->__toString(),
+ );
+ }
+ }
+ return array('ResultSet' => array('Result' => $values));
+ }
+
+ /**
+ * Gets vendor canidated to be used as vendor - called as ajax
from edit form
+ *
+ * @param string $query
+ *
+ * @return array
+ */
+ public function get_vendors()
+ {
+ if (!$this->acl_read)
+ {
+ return;
+ }
+
+ $query = phpgw::get_var('query');
+
+ $sogeneric = CreateObject('property.sogeneric',
'vendor');
+ $values = $sogeneric->read(array('query' => $query));
+ foreach ($values as &$entry)
+ {
+ $entry['name'] = $entry['org_name'];
+ }
+ return array('ResultSet' => array('Result' => $values));
+ }
+
+ /**
+ * Edit title fo entity directly from table
+ *
+ * @param int $id id of entity
+ * @param string $value new title of entity
+ *
+ * @return string text to appear in ui as receipt on action
+ */
+ public function edit_title()
+ {
+ $id = phpgw::get_var('id', 'int', 'POST');
+
+ if (!$this->acl_edit)
+ {
+ return lang('no access');
+ }
+
+ if ($id)
+ {
+ $values = $this->bo->read_single(array('id' =>
$id, 'view' => true));
+ $values['title'] = phpgw::get_var('value');
+
+ try
+ {
+ $this->bo->edit_title($values);
+ }
+ catch (Exception $e)
+ {
+ if ($e)
+ {
+ echo $e->getMessage();
+ }
+ }
+ echo true;
+ }
+ else
+ {
+ echo "ERROR";
+ }
+ }
+
+ /**
+ * Delete document and all related info
+ *
+ * @param int $id id of entity
+ *
+ * @return string text to appear in ui as receipt on action
+ */
+ public function delete()
+ {
+ if (!$GLOBALS['phpgw']->acl->check('.admin',
PHPGW_ACL_DELETE, 'property'))
+ {
+ return 'No access';
+ }
+ $id = phpgw::get_var('id', 'int', 'GET');
+
+ try
+ {
+ $this->bo->delete($id);
+ }
+ catch (Exception $e)
+ {
+ if ($e)
+ {
+ return $e->getMessage();
+ }
+ }
+ return 'Deleted';
+ }
+
+ /*
+ * Overrides with incoming data from POST
+ */
+
+ private function _populate( $data = array() )
+ {
+
+ $values = phpgw::get_var('values');
+
+ $_fields = array
+ (
+ array
+ (
+ 'name' => 'title',
+ 'type' => 'string',
+ 'required' => true
+ ),
+ array
+ (
+ 'name' => 'descr',
+ 'type' => 'string',
+ 'required' => true
+ ),
+ array
+ (
+ 'name' => 'cat_id',
+ 'type' => 'integer',
+ 'required' => true
+ ),
+ array
+ (
+ 'name' => 'report_date',
+ 'type' => 'string',
+ 'required' => true
+ ),
+ array
+ (
+ 'name' => 'status_id',
+ 'type' => 'integer',
+ 'required' => true
+ ),
+ array
+ (
+ 'name' => 'vendor_id',
+ 'type' => 'integer',
+ 'required' => false
+ ),
+ array
+ (
+ 'name' => 'vendor_name',
+ 'type' => 'string',
+ 'required' => false
+ ),
+ array
+ (
+ 'name' => 'coordinator_id',
+ 'type' => 'integer',
+ 'required' => false
+ ),
+ array
+ (
+ 'name' => 'coordinator_name',
+ 'type' => 'string',
+ 'required' => false
+ ),
+ array
+ (
+ 'name' => 'multiplier',
+ 'type' => 'float',
+ 'required' => false
+ ),
+ );
+
+
+ foreach ($_fields as $_field)
+ {
+ if ($data[$_field['name']] =
$_POST['values'][$_field['name']])
+ {
+ $data[$_field['name']] =
phpgw::clean_value($data[$_field['name']], $_field['type']);
+ }
+ if ($_field['required'] &&
!$data[$_field['name']])
+ {
+ $this->receipt['error'][] = array('msg'
=> lang('Please enter value for attribute %1', $_field['name']));
+ }
+ }
+
+
+ /*
+ * Extra data from custom fields
+ */
+ $values['attributes'] =
phpgw::get_var('values_attribute');
+
+ if (is_array($values['attributes']))
+ {
+ foreach ($values['attributes'] as $attribute)
+ {
+ if ($attribute['nullable'] != 1 &&
(!$attribute['value'] && !$values['extra'][$attribute['name']]))
+ {
+ $this->receipt['error'][] =
array('msg' => lang('Please enter value for attribute %1',
$attribute['input_text']));
+ }
+ }
+ }
+
+ if (!isset($values['cat_id']) || !$values['cat_id'])
+ {
+ $this->receipt['error'][] = array('msg' =>
lang('Please select a category !'));
+ }
+
+ if (!isset($values['title']) || !$values['title'])
+ {
+ $this->receipt['error'][] = array('msg' =>
lang('Please give a title !'));
+ }
+
+ if (!isset($values['report_date']) ||
!$values['report_date'])
+ {
+ $this->receipt['error'][] = array('msg' =>
lang('Please select a date!'));
+ }
+
+ return $values;
+ }
+
+ private function _get_categories( $selected = 0 )
+ {
+ $cats = CreateObject('phpgwapi.categories', -1,
'property', $this->acl_location);
+ $cats->supress_info = true;
+ $categories = $cats->formatted_xslt_list(array('format'
=> 'filter', 'selected' => $selected,
+ 'globals' => true, 'use_acl' =>
$this->_category_acl));
+ $default_value = array('cat_id' => '', 'name' =>
lang('no category'));
+ array_unshift($categories['cat_list'], $default_value);
+
+ foreach ($categories['cat_list'] as & $_category)
+ {
+ $_category['id'] = $_category['cat_id'];
+ }
+
+ return $categories['cat_list'];
+ }
+ }
\ No newline at end of file
Copied: branches/dev-syncromind-2/property/templates/base/generic_document.xsl
(from rev 14935, trunk/property/templates/base/generic_document.xsl)
===================================================================
--- branches/dev-syncromind-2/property/templates/base/generic_document.xsl
(rev 0)
+++ branches/dev-syncromind-2/property/templates/base/generic_document.xsl
2016-04-25 16:40:07 UTC (rev 14936)
@@ -0,0 +1,330 @@
+<!-- $Id: generic_document.xsl 14792 2016-03-01 18:59:36Z sigurdne $ -->
+
+<!-- add / edit -->
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+
+ <div id="document_edit_tabview">
+
+ <h1>
+ <xsl:value-of select="php:function('lang', 'generic
document')" />
+ </h1>
+
+
+ <xsl:variable name="action_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uigeneric_document.save')" />
+ </xsl:variable>
+
+ <xsl:value-of select="validator"/>
+
+ <form name="form" class="pure-form pure-form-aligned" id="form"
action="{$action_url}" method="post" ENCTYPE="multipart/form-data">
+ <div id="tab-content">
+
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+
+ <div id="generic">
+
+ <h3>Generic document
information::metadata <br/>
+ the metadata might be stored as
XML (or JSONB) in "phpgw_vfs_filedata"
+
+ </h3>
+ <fieldset>
+ <xsl:choose>
+ <xsl:when
test="document/id!=''">
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'id')" />
+ </label>
+
<xsl:value-of select="document/id"/>
+ <input
type="hidden" name="id" value="{document/id}"/>
+
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when
test="location_data2!=''">
+ <xsl:choose>
+
<xsl:when test="editable = 1">
+
<xsl:call-template name="location_form2"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:call-template name="location_view2"/>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+
+ <div class="pure-control-group">
+ <label for="name">
+ <xsl:value-of
select="php:function('lang', 'name')" />
+ </label>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <input
id="title" name='values[title]' type="text" value="{document/title}">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'Please enter a title !')"/>
+
</xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="document/title" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="pure-control-group"
>
+ <label for="name">
+ <xsl:value-of
select="php:function('lang', 'description')" />
+ </label>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+
<textarea id="descr" rows="6" style="width:40%; resize:none;"
name="values[descr]">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'Please enter a description
!')"/>
+
</xsl:attribute>
+
<xsl:value-of select="document/descr" disable-output-escaping="yes"/>
+
</textarea>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="document/descr" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="pure-control-group">
+ <label for="category">
+ <xsl:value-of
select="php:function('lang', 'category')" />
+ <br/>
+ <h3>-or
multiple "TAGS"</h3>
+ </label>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <select
id="cat_id" name="values[cat_id]">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'Please enter a category
!')"/>
+
</xsl:attribute>
+
<xsl:apply-templates select="categories/options"/>
+
</select>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:for-each select="categories/options">
+
<xsl:if test="selected = 'selected' or selected = 1">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</xsl:if>
+
</xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="pure-control-group">
+ <label for="date">
+ <xsl:value-of
select="php:function('lang', 'date')" />
+ </label>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <input
id="report_date" name='values[report_date]' type="text"
value="{document/report_date}"
+
data-validation="date" data-validation-format="dd/mm/yyyy"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="document/report_date"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="pure-control-group">
+ <label for="status">
+ <xsl:value-of
select="php:function('lang', 'status')" />
+ </label>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <select
id="status_id" name="values[status_id]">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'Please enter a status !')"/>
+
</xsl:attribute>
+
<xsl:apply-templates select="status_list/options"/>
+
</select>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:for-each select="status_list/options">
+
<xsl:if test="selected = 'selected' or selected = 1">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</xsl:if>
+
</xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="pure-control-group">
+ <label
for="coordinator">
+ <xsl:value-of
select="lang_coordinator" />
+ </label>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <!--div
class="autocomplete"-->
+ <input
type="hidden" id="coordinator_id" name="values[coordinator_id]"
value="{document/coordinator_id}"/>
+ <input
type="text" id="coordinator_name" name="values[coordinator_name]"
value="{document/coordinator_name}">
+ </input>
+ <div
id="coordinator_container"/>
+
<!--/div-->
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="document/coordinator_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="pure-control-group">
+ <label for="vendor">
+ <xsl:value-of
select="php:function('lang', 'vendor')" />
+ </label>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <!--div
class="autocomplete"-->
+ <input
type="hidden" id="vendor_id" name="values[vendor_id]"
value="{document/vendor_id}"/>
+ <input
type="text" id="vendor_name" name="values[vendor_name]"
value="{document/vendor_name}">
+ </input>
+ <div
id="vendor_container"/>
+
<!--/div-->
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="document/vendor_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'upload file')"/>
+ </label>
+ <input
type="file" name="file" size="40">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Select file to upload')"/>
+
</xsl:attribute>
+ </input>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
+ </fieldset>
+ </div>
+
+ <div id="relations">
+
+ <h3>Implement how to find and link
documents to items - using "location_id", "item_id" and the
"phpgw_vfs_file_relation"</h3>
+
+ <div class="pure-control-group">
+ <label for="vendor">
+ <xsl:value-of
select="php:function('lang', 'item types')" />
+ </label>
+ <select id="location_id"
name="location_id">
+ <xsl:apply-templates
select="location_filter/options"/>
+ </select>
+ </div>
+
+ <h3> Should be able to get items from
the following (have a look at <a
href="{link_controller_example}">controller</a>) for how it is used</h3>
+
+ <xsl:text>
+ $_components =
execMethod('property.soentity.read', array(
+ 'filter_entity_group' =>
$entity_group_id,
+ 'location_id' => $_location_id,
+ 'district_id' => $district_id,
+ 'allrows' => true,
+ 'filter_item' => $component_list
+ )
+ );
+ </xsl:text>
+
+ <div class="pure-control-group">
+
+ <xsl:for-each
select="datatable_def">
+ <xsl:if test="container
= 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ </div>
+ <div class="proplist-col">
+ <xsl:variable name="lang_cancel">
+ <xsl:value-of
select="php:function('lang', 'cancel')" />
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="editable = 1">
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save')" />
+ </xsl:variable>
+ <input type="submit"
class="pure-button pure-button-primary" name="save_project"
value="{$lang_save}" title = "{$lang_save}" />
+ <input class="pure-button
pure-button-primary" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="lang_edit">
+ <xsl:value-of
select="php:function('lang', 'edit')" />
+ </xsl:variable>
+ <xsl:variable
name="lang_new_document">
+ <xsl:value-of
select="php:function('lang', 'new')" />
+ </xsl:variable>
+ <input type="button"
class="pure-button pure-button-primary" name="edit_document"
value="{$lang_edit}" title = "{$lang_edit}"
onClick="document.load_edit_form.submit();"/>
+ <input type="button"
class="pure-button pure-button-primary" name="new_document"
value="{$lang_new_document}" title = "{$lang_new_document}"
onClick="document.new_form.submit();"/>
+ <input class="pure-button
pure-button-primary" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
+ </div>
+
+ <xsl:variable name="cancel_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uigeneric_document.index')" />
+ </xsl:variable>
+
+ <form name="cancel_form" id="cancel_form" action="{$cancel_url}"
method="post">
+ </form>
+ <xsl:variable name="new_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uigeneric_document.add')" />
+ </xsl:variable>
+ <form name="new_form" id="new_form" action="{$new_url}" method="post">
+ </form>
+
+ <xsl:variable name="edit_params">
+ <xsl:text>menuaction:property.uigeneric_document.edit,
id:</xsl:text>
+ <xsl:value-of select="document/id" />
+ </xsl:variable>
+ <xsl:variable name="edit_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $edit_params )" />
+ </xsl:variable>
+
+ <form name="load_edit_form" id="load_edit_form" action="{$edit_url}"
method="post">
+ </form>
+
+
+
+</xsl:template>
+
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected = 1">
+ <xsl:attribute name="selected" value="selected" />
+ </xsl:if>
+ <xsl:attribute name="title" value="description" />
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |