Use skills

composer.json

@@ -0,0 +1,24 @@
+{
+	"name": "egroupware/projectmanager",
+	"description": "EGroupware project-management application",
+	"type": "egroupware-app",
+	"homepage": "https://www.egroupware.org/",
+	"license": "GPL-2.0-or-later",
+	"authors": [
+        {
+            "name": "Ralf Becker",
+            "email": "rb@egroupware.org"
+        },
+        {
+            "name": "Hadi Nategh",
+            "email": "hn@egroupware.org"
+        },
+        {
+            "name": "Nathan Gray",
+            "email": "ng@egroupware.org"
+        }
+    ],
+	"require": {
+		"egroupware/egroupware": "self.version"
+	}
+}

inc/class.projectmanager_datasource.inc.php

@@ -140,7 +140,6 @@ function get($data_id)
 		// return the projectmembers as resources
 		$ds['pe_resources'] = $data['pm_members'] ? array_keys($data['pm_members']) : array($data['pm_creator']);
 		$ds['pe_details'] = $data['pm_description'];
-		$ds['pe_status'] = $data['pm_status'];
 
 		// use completition calculated by times, if completion is only set from the elements
 		// if re is set, use this

inc/class.projectmanager_elements_bo.inc.php

@@ -96,7 +96,7 @@ class projectmanager_elements_bo extends projectmanager_elements_so
 	 */
 	var $status_filter = array(
 		'all'     => false,
-		'used'    => array('new','regular'),
+		'used'    => '!ignore',
 		'new'     => 'new',
 		'ignored' => 'ignore',
 	);
@@ -261,12 +261,8 @@ function &update($app,$id,$pe_id=0,$pm_id=null,$update_project=true,$extra_keys=
 			$this->data['pm_id'] = $pm_id;
 			$this->data['pe_id'] = $pe_id;
 			$this->data['pe_overwrite'] = 0;		// none set so far
+			$this->data['pe_status']= 'new';
 
-			// only set status if it's not set by the datasource
-			if (!isset($this->data['pe_status']))
-			{
-				$this->data['pe_status']= 'new';
-			}
 			// if user linking has no ADD rights, the entry is set to ignored
 			if (!$this->check_acl(Acl::ADD,array('pm_id'=>$pm_id)) && !
 				($this->check_acl(EGW_ACL_ADD_TIMESHEET, array('pm_id'=>$pm_id)) && $app == 'timesheet')
@@ -563,11 +559,11 @@ function save($keys=null,$touch_modified=true,$update_project=-1)
 	 * deletes a project-element or all project-elements of a project, reimplemented to remove the link too
 	 *
 	 * @param array/int $keys if given array with pm_id and/or pe_id or just an integer pe_id
-	 * @param boolean $delete_sources=false true=delete datasources of the elements too (if supported by the datasource), false dont do it
-	 * @param boolean $unlink = false Internal use only, passing false will skip the unlinking steps
+	 * @param boolean $delete_sources =false true=delete datasources of the elements too (if supported by the datasource), false dont do it
+	 * @param boolean $unlink =true Internal use only, passing false will skip the unlinking steps
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null,$delete_sources=false, $unlink = true)
+	function delete($keys=null,$delete_sources=false, $unlink=true)
 	{
 		if ((int) static::DEBUG >= 1 || static::DEBUG === 'delete') {
 			projectmanager_bo::debug_message("projectmanager_elements_bo::delete(" . print_r($keys, true) . ",$delete_sources) this->data[pm_id] = " . $this->data['pm_id']);
@@ -927,7 +923,12 @@ function search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard=
 			}
 			if ($cumulate_in)	// do we have something (timesheets) to cumulate
 			{
-				foreach(parent::search(array('pe_id' => array_keys($cumulate_in)),false) as $to_cumulate)
+				foreach(parent::search(
+						array('pe_id' => array_keys($cumulate_in))
+						,false,'','','',False, 'AND',false,array(
+							 'pe_status != "ignore"'
+						)
+				) as $to_cumulate)
 				{
 					// get the row, where the entry cumulates
 					if (($k = array_search($cumulate_in[$to_cumulate['pe_id']],$row_pe_ids)) !== false)

inc/class.projectmanager_elements_ui.inc.php

@@ -508,6 +508,12 @@ function get_rows(&$query_in,&$rows,&$readonlys)
 		if ($this->status_filter[$query['filter']])
 		{
 			$query['col_filter']['pe_status'] = $this->status_filter[$query['filter']];
+
+			if ($query['col_filter']['pe_status'][0] === '!')
+			{
+				$query['col_filter'][] = 'pe_status != '.$this->db->quote(substr($query['col_filter']['pe_status'], 1));
+				unset($query['col_filter']['pe_status']);
+			}
 		}
 		else
 		{
@@ -816,15 +822,22 @@ protected function get_actions()
 				'checkbox' => true,
 				'isChecked' => 'javaScript:app.projectmanager.is_ignored',
 				'onExecute' => 'javaScript:app.projectmanager.ignore_action'
-			),
-			'timesheet' => array(
+			)
+		);
+		$group++;
+		if ($GLOBALS['egw_info']['user']['apps']['timesheet'])
+		{
+			$actions['timesheet'] = array(
 				'icon' => 'timesheet/navbar',
 				'caption' => 'Timesheet',
 				'egw_open' => 'add-timesheet',
 				'allowOnMultiple' => false,
-				'group' => ++$group,
-			),
-			'infolog-subs' => array(
+				'group' => $group,
+			);
+		}
+		if ($GLOBALS['egw_info']['user']['apps']['infolog'])
+		{
+			$actions['infolog-subs'] = array(
 				'icon' => 'infolog/navbar',
 				'caption' => 'View subs',
 				'hint' => 'View all subs of this entry',
@@ -835,8 +848,8 @@ protected function get_actions()
 				'url' => 'menuaction=infolog.infolog_ui.index&action=sp&action_id=$id',
 				'targetapp' => 'infolog',
 				'hideOnDisabled' => true
-			),
-		);
+			);
+		}
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(

inc/class.projectmanager_export_elements_csv.inc.php

@@ -17,7 +17,8 @@
 /**
  * export project elements to CSV
  */
-class projectmanager_export_elements_csv implements importexport_iface_export_plugin {
+class projectmanager_export_elements_csv implements importexport_iface_export_plugin
+{
 
 	// Used in conversions
 	static $types = array(
@@ -37,20 +38,25 @@ class projectmanager_export_elements_csv implements importexport_iface_export_pl
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 		$no_project = true;
 
-		if($options['pm_id']) {
+		if($options['pm_id'])
+		{
 			$_REQUEST['pm_id'] = $options['pm_id'];
 			$no_project = false;
-		} elseif(!$GLOBALS['egw_info']['user']['preferences']['projectmanager']['current_project']) {
+		}
+		elseif(!$GLOBALS['egw_info']['user']['preferences']['projectmanager']['current_project'])
+		{
 			// Fake a pm_id so elements_ui works
 			$_REQUEST['pm_id'] = 1;
 		}
 		$ui = new projectmanager_elements_ui();
 		$selection = array();
-		if ($options['selection'] == 'selected') {
+		if ($options['selection'] == 'selected')
+		{
 			// ui selection with 'Use search results'
 			$query = $old_query = Api\Cache::getSession('projectmanager', 'projectelements_list');
 			$query['num_rows'] = -1;	// all
@@ -161,23 +167,28 @@ public function export( $_stream, importexport_definition $_definition) {
 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
-		foreach ($selection as $record) {
+		foreach ($selection as $record)
+		{
 			if(!is_array($record) || !$record['pe_id']) continue;
-			if(is_array($record['pe_resources'])) {
+			if(is_array($record['pe_resources']))
+			{
 				$resources = array();
-				foreach($record['pe_resources'] as $resource) {
+				foreach($record['pe_resources'] as $resource)
+				{
 					$resources[] = Api\Accounts::username($resource);
 				}
 				$record['pe_resources'] = implode(',', $resources);
 			}
 			$element = new projectmanager_egw_record_element();
 			$element->set_record($record);
-			if($options['mapping']['pm_title']) {
+			if($options['mapping']['pm_title'])
+			{
 				$project = ExecMethod('projectmanager.projectmanager_bo.read', $element->pm_id);
 				$element->pm_title = $project['pm_title'];
 			}
 
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($element, self::$types);
 			}
 			$this->convert($element, $options);
@@ -192,7 +203,8 @@ public function export( $_stream, importexport_definition $_definition) {
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Project element CSV export');
 	}
 
@@ -201,7 +213,8 @@ public static function get_name() {
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports a list of project elements to a CSV File.");
 	}
 
@@ -210,11 +223,13 @@ public static function get_description() {
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -234,18 +249,29 @@ public function get_filename()
 	}
 
 	/**
-	 * return Api\Html for options.
-	 * this way the plugin has all opportunities for options tab
+	 * Return array of settings for export dialog
+	 *
+	 * @param $definition Specific definition
 	 *
+	 * @return array (
+	 * 		name 		=> string,
+	 * 		content		=> array,
+	 * 		sel_options	=> array,
+	 * 		readonlys	=> array,
+	 * 		preserv		=> array,
+	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl(importexport_definition &$definition = NULL)
+	{
+		return false;
 	}
 
 	/**
 	 * returns selectors information
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'projectmanager.export_elements_csv_selectors',
 			'content'	=> array(
@@ -261,7 +287,8 @@ public function get_selectors_etpl() {
 	 *
 	 * @param projectmanager_egw_record_project $record Record to be converted
 	 */
-	protected static function convert(projectmanager_egw_record_element &$record, array $options = array()) {
+	protected static function convert(projectmanager_egw_record_element &$record, array $options = array())
+	{
 		foreach(array('pe_used_time', 'pe_planned_time', 'pe_replanned_time') as $duration) {
 			switch($options[$duration]) {
 				case 'd':
@@ -281,7 +308,7 @@ public static function get_egw_record_class()
 	{
 		return 'projectmanager_egw_record_element';
 	}
-	
+
 	/**
 	 * Adjust automatically generated filter fields
 	 */

inc/class.projectmanager_export_projects_csv.inc.php

@@ -236,11 +236,21 @@ public function get_filename()
 	}
 
 	/**
-	 * return html for options.
-	 * this way the plugin has all opportunities for options tab
+	 * Return array of settings for export dialog
 	 *
+	 * @param $definition Specific definition
+	 *
+	 * @return array (
+	 * 		name 		=> string,
+	 * 		content		=> array,
+	 * 		sel_options	=> array,
+	 * 		readonlys	=> array,
+	 * 		preserv		=> array,
+	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl(importexport_definition &$definition = NULL)
+	{
+		return false;
 	}
 
 	/**