[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged inc/class.ged_ui.inc.php inc/class.ged_dm.i...
|
From: |
Pascal Vilarem |
|
Subject: |
[Phpgroupware-cvs] ged inc/class.ged_ui.inc.php inc/class.ged_dm.i... |
|
Date: |
Wed, 28 Mar 2007 13:31:57 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/03/28 13:31:57
Modified files:
inc : class.ged_ui.inc.php class.ged_dm.inc.php
templates/base/images/work: status_icons.svg
templates/base : browse.tpl
Added files:
templates/base/images: pending_for_quality_review-16.png
pending_for_quality_review-48.png
pending_for_technical_review-32.png
pending_for_quality_review-32.png
pending_for_technical_review-48.png
pending_for_technical_review-16.png
Log message:
Splitted internal review step in technical and quality review.
cleanint replaced by (int) thx Dave Hall
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/work/status_icons.svg?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/pending_for_quality_review-16.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/pending_for_quality_review-48.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/pending_for_technical_review-32.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/pending_for_quality_review-32.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/pending_for_technical_review-48.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/pending_for_technical_review-16.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/browse.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
Patches:
Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- inc/class.ged_ui.inc.php 26 Mar 2007 14:04:33 -0000 1.16
+++ inc/class.ged_ui.inc.php 28 Mar 2007 13:31:56 -0000 1.17
@@ -22,7 +22,7 @@
var $debug=1;
var $browser;
- var $public_functions=array('browse'=>true, 'add_file'=>true,
'add_folder'=>true, 'update_file'=>true, 'update_folder'=>true,
'delete_folder'=>true, 'download'=>true, 'view'=>true, 'update_file'=>true,
'delete_file'=>true, 'change_acl'=>true, 'approve_file'=>true, 'submit_file'=>
true, 'accept_file'=> true, 'deliver_file'=> true, 'reject_file'=> true );
+ var $public_functions=array('browse'=>true, 'add_file'=>true,
'add_folder'=>true, 'update_file'=>true, 'update_folder'=>true,
'delete_folder'=>true, 'download'=>true, 'view'=>true, 'update_file'=>true,
'delete_file'=>true, 'change_acl'=>true, 'approve_file'=>true, 'submit_file'=>
true, 'accept_file'=> true, 'refuse_file'=> true, 'deliver_file'=> true,
'reject_file'=> true );
var $icons;
@@ -786,7 +786,7 @@
// TODO : droit specifique d'approbation ?
- if ( $this->ged_dm->admin &&
($last_version['status'] == 'working' || $last_version['status'] ==
'pending_for_internal_review' || $last_version['status'] ==
'pending_for_approval' ) )
+ if ( $this->ged_dm->admin &&
($last_version['status'] == 'working' || $last_version['status'] ==
'pending_for_technical_review' || $last_version['status'] ==
'pending_for_quality_review' || $last_version['status'] ==
'pending_for_approval' ) )
{
$link_data=null;
$link_data['menuaction']='ged.ged_ui.approve_file';
@@ -795,13 +795,19 @@
$this->t->set_var('approve_file', "<a
href=\"".$approve_file_url."\">".lang('Approve file')."</a>");
}
- if ( $this->ged_dm->admin &&
$last_version['status'] == 'pending_for_internal_review' )
+ if ( $this->ged_dm->admin && (
$last_version['status'] == 'pending_for_technical_review' ||
$last_version['status'] == 'pending_for_quality_review' ) )
{
$link_data=null;
$link_data['menuaction']='ged.ged_ui.accept_file';
$link_data['element_id']=$focused_id;
$accept_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
$this->t->set_var('accept_file', "<a
href=\"".$accept_file_url."\">".lang('Accept file')."</a>");
+
+ $link_data=null;
+
$link_data['menuaction']='ged.ged_ui.refuse_file';
+ $link_data['element_id']=$focused_id;
+
$refuse_file_url=$GLOBALS['phpgw']->link('/index.php', $link_data);
+ $this->t->set_var('refuse_file', "<a
href=\"".$refuse_file_url."\">".lang('Refuse file')."</a>");
}
if ( $this->ged_dm->admin &&
$last_version['status'] == 'ready_for_delivery' )
@@ -1921,6 +1927,19 @@
$GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
}
+ function refuse_file()
+ {
+ $element_id=get_var('element_id', array('GET', 'POST'));
+
+ $this->ged_dm->refuse_file ( $element_id );
+
+ $link_data=null;
+ $link_data['menuaction']='ged.ged_ui.browse';
+ $link_data['focused_id']=$element_id;
+
+ $GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
+ }
+
function accept_file()
{
$element_id=get_var('element_id', array('GET', 'POST'));
Index: inc/class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- inc/class.ged_dm.inc.php 27 Mar 2007 18:03:59 -0000 1.13
+++ inc/class.ged_dm.inc.php 28 Mar 2007 13:31:56 -0000 1.14
@@ -104,16 +104,6 @@
return ($the_str2);
}
- function cleanint ( $the_int )
- {
- if ( is_int($the_int))
- $the_int2=$the_int;
- else
- $the_int2=0;
-
- return ($the_int2);
- }
-
function get_file_extention($filename)
{
$ext=strtolower(substr(strrchr($filename, "."), 1));
@@ -202,7 +192,7 @@
$sql_model.=" element_id=%d";
if ( array_key_exists('validity_period', $new_file) )
-
$new_file2['validity_period']=$this->cleanint($new_file['validity_period']);
+ $new_file2['validity_period']= (int)
$new_file['validity_period'];
else
$new_file2['validity_period']=null;
@@ -801,7 +791,7 @@
$sql="SELECT * FROM ".$this->tables['versions']." ";
$sql.="WHERE element_id=".$element_id." ";
- $sql.="AND ( status='pending_for_internal_review' )";
+ $sql.="AND ( status='pending_for_technical_review' or
status='pending_for_quality_review')";
$sql.="ORDER BY version_id DESC LIMIT 1";
if ( $this->debug('get_pending_for_internal_review') )
@@ -946,7 +936,7 @@
$sql="SELECT * FROM ".$this->tables['versions']." ";
$sql.="WHERE element_id=".$element_id." ";
- $sql.="AND ( status='working' OR
status='pending_for_internal_review' OR status='pending_for_approval' )";
+ $sql.="AND ( status='working' OR
status='pending_for_technical_review' OR status='pending_for_quality_review' OR
status='pending_for_approval' )";
$sql.="ORDER BY version_id DESC LIMIT 1";
if ( $this->debug('get_working_version') )
@@ -1702,8 +1692,30 @@
}
// Say file is not valid
+
+ function refuse_file ( $element_id, $reason="Default reason" )
+ {
+
$pending_version=$this->get_pending_for_internal_review($element_id);
+
+ // Need to check if there is a working version
+ if (is_array($pending_version) )
+ {
+ if ($pending_version['version_id'] )
+ {
+ $next_status='working';
+
+ $sql="UPDATE ged_versions set
status='".$next_status."' WHERE version_id=".$pending_version['version_id'];
+ $this->db->query($sql, __LINE__,
__FILE__);
+ }
+ }
+
+ $this->db->unlock();
+ }
+
+ // Say file is not valid
// A new version must be worked on and delivered
// User must have approval rights on this document
+
function reject_file ( $element_id, $reason="Default reason" )
{
$pending_version=$this->get_pending_for_approval($element_id);
@@ -1760,7 +1772,7 @@
{
// Set "pending_for_internal_review"
status
// TODO : Add submission date
- $sql="UPDATE ged_versions set
status='pending_for_internal_review' WHERE
version_id=".$working_version['version_id'];
+ $sql="UPDATE ged_versions set
status='pending_for_technical_review' WHERE
version_id=".$working_version['version_id'];
$this->db->query($sql, __LINE__,
__FILE__);
}
}
@@ -1779,7 +1791,14 @@
{
// Set "pending_for_internal_review"
status
// TODO : Add submission date
- $sql="UPDATE ged_versions set
status='ready_for_delivery' WHERE version_id=".$pending_version['version_id'];
+ if (
$pending_version['status']=='pending_for_technical_review' )
+
$next_status='pending_for_quality_review';
+ elseif
($pending_version['status']=='pending_for_quality_review' )
+
$next_status='ready_for_delivery';
+ else
+
$next_status=$pending_version['status'];
+
+ $sql="UPDATE ged_versions set
status='".$next_status."' WHERE version_id=".$pending_version['version_id'];
$this->db->query($sql, __LINE__,
__FILE__);
}
}
@@ -1971,7 +1990,7 @@
$sql.="FROM ( ged_elements ";
$sql.="INNER JOIN ged_versions as ged_current_version ";
$sql.="ON
ged_elements.element_id=ged_current_version.element_id ";
- $sql.="AND (
ged_current_version.status='pending_for_internal_review' or
ged_current_version.status='pending_for_approval' or
ged_current_version.status='ready_for_delivery' )) ";
+ $sql.="AND (
ged_current_version.status='pending_for_technical_review' or
ged_current_version.status='pending_for_quality_review' or
ged_current_version.status='pending_for_approval' or
ged_current_version.status='ready_for_delivery' )) ";
$sql.="GROUP BY ged_elements.element_id ";
$this->db->query($sql);
Index: templates/base/images/work/status_icons.svg
===================================================================
RCS file:
/sources/phpgroupware/ged/templates/base/images/work/status_icons.svg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/images/work/status_icons.svg 21 Mar 2007 13:44:42 -0000
1.3
+++ templates/base/images/work/status_icons.svg 28 Mar 2007 13:31:56 -0000
1.4
@@ -18,13 +18,24 @@
sodipodi:docname="status_icons.svg"
sodipodi:docbase="/home/pascal/public_html/phpgroupwarehead/ged/templates/base/images/work"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
-
inkscape:export-filename="/home/pascal/public_html/phpgroupwarehead/ged/templates/base/images/add-48.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
+
inkscape:export-filename="/home/pascal/public_html/phpgroupwarehead/ged/templates/base/images/pending_for_quality_review-16.png"
+ inkscape:export-xdpi="30"
+ inkscape:export-ydpi="30"
sodipodi:modified="TRUE">
<defs
id="defs4">
<linearGradient
+ id="linearGradient3261">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3263" />
+ <stop
+ style="stop-color:#e47dfc;stop-opacity:1;"
+ offset="1"
+ id="stop3265" />
+ </linearGradient>
+ <linearGradient
id="linearGradient12142">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -437,6 +448,26 @@
y1="30.118963"
x2="8.1621113"
y2="-1.1174588" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3261"
+ id="radialGradient2288"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(0.6735047,0.5399625,-0.5610836,0.6998494,15.636283,-5.302047)"
+ cx="21.872944"
+ cy="16.022375"
+ fx="21.872944"
+ fy="16.022375"
+ r="23.485413" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3149"
+ id="linearGradient2290"
+ gradientUnits="userSpaceOnUse"
+ x1="27.017641"
+ y1="30.118963"
+ x2="8.1621113"
+ y2="-1.1174588" />
</defs>
<sodipodi:namedview
id="base"
@@ -445,16 +476,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4.0000001"
- inkscape:cx="32.928613"
- inkscape:cy="21.494098"
+ inkscape:zoom="8.0000002"
+ inkscape:cx="27.855179"
+ inkscape:cy="20.377514"
inkscape:document-units="px"
- inkscape:current-layer="layer12"
+ inkscape:current-layer="layer13"
width="48px"
height="48px"
- inkscape:window-width="1118"
+ inkscape:window-width="1009"
inkscape:window-height="710"
- inkscape:window-x="1383"
+ inkscape:window-x="1492"
inkscape:window-y="46" />
<metadata
id="metadata7">
@@ -566,6 +597,62 @@
</g>
<g
inkscape:groupmode="layer"
+ id="layer13"
+ inkscape:label="pending_for_quality_review"
+ sodipodi:insensitive="true">
+ <path
+ sodipodi:type="arc"
+
style="opacity:1;fill:url(#radialGradient2288);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2290);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="path2276"
+ sodipodi:cx="25.569487"
+ sodipodi:cy="25.208433"
+ sodipodi:rx="23.422913"
+ sodipodi:ry="23.422913"
+ d="M 48.992399 25.208433 A 23.422913 23.422913 0 1 1
2.146574,25.208433 A 23.422913 23.422913 0 1 1 48.992399 25.208433 z"
+ transform="matrix(0.9163982,0,0,0.9163982,0.8181681,0.6490373)" />
+ <g
+ style="opacity:1;display:inline"
+ id="g2278"
+ transform="translate(0.1830431,-0.1133097)">
+ <path
+ sodipodi:end="6.6843736"
+ sodipodi:start="4.7342189"
+ transform="translate(-3.25,-2)"
+ d="M 27.509722,8.1291994 A 17.625,17.625 0 0 1 43.350533,32.632784 L
27.125,25.75 z"
+ sodipodi:ry="17.625"
+ sodipodi:rx="17.625"
+ sodipodi:cy="25.75"
+ sodipodi:cx="27.125"
+ id="path2280"
+
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.639;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ transform="translate(37.875,3.375)"
+ sodipodi:open="true"
+ sodipodi:end="11.002396"
+ sodipodi:start="4.7342189"
+ d="M -13.198242,3.0041696 A 16.6875,17.5 0 1 1 -13.448664,3.0004072"
+ sodipodi:ry="17.5"
+ sodipodi:rx="16.6875"
+ sodipodi:cy="20.5"
+ sodipodi:cx="-13.5625"
+ id="path2282"
+
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.639;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path2284"
+ d="M 7.625,24.25 C 7.9860752,24.177812 10.97599,24.27944
11.21875,24.21875"
+
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <path
+ sodipodi:nodetypes="cc"
+ id="path2286"
+ d="M 24.21875,38.4375 C 24.27511,38.774972 24.208333,41.09375
24.25,41.21875"
+
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
id="layer6"
inkscape:label="ready_for_delivery"
sodipodi:insensitive="true"
@@ -731,7 +818,7 @@
id="layer11"
inkscape:label="plus"
sodipodi:insensitive="true"
- style="display:inline">
+ style="display:none">
<path
sodipodi:type="arc"
style="opacity:1;fill:url(#radialGradient2260);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2262);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
@@ -751,7 +838,8 @@
inkscape:groupmode="layer"
id="layer12"
inkscape:label="moins"
- style="opacity:1;display:none">
+ style="opacity:1;display:none"
+ sodipodi:insensitive="true">
<path
sodipodi:type="arc"
style="opacity:1;fill:url(#radialGradient3245);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3247);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
Index: templates/base/browse.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/browse.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/browse.tpl 8 Mar 2007 17:01:31 -0000 1.2
+++ templates/base/browse.tpl 28 Mar 2007 13:31:57 -0000 1.3
@@ -1,4 +1,4 @@
-<div id="ged_top_menu">{top_link} {up_link} {update_folder} {add_folder}
{delete_folder} {add_file} {edit_file} {update_file} {approve_file}
{delete_file} {change_acl}</div>
+<div id="ged_top_menu">{top_link} {up_link} {update_folder} {add_folder}
{delete_folder} {add_file} {edit_file} {update_file} {refuse_file}
{accept_file} {submit_file} {deliver_file} {reject_file} {approve_file}
{delete_file} {change_acl}</div>
<br/>
<div id="ged_info">
{main_content}
Index: templates/base/images/pending_for_quality_review-16.png
===================================================================
RCS file: templates/base/images/pending_for_quality_review-16.png
diff -N templates/base/images/pending_for_quality_review-16.png
Binary files /dev/null and /tmp/cvsd2PZiC differ
Index: templates/base/images/pending_for_quality_review-48.png
===================================================================
RCS file: templates/base/images/pending_for_quality_review-48.png
diff -N templates/base/images/pending_for_quality_review-48.png
Binary files /dev/null and /tmp/cvsg9BsJF differ
Index: templates/base/images/pending_for_technical_review-32.png
===================================================================
RCS file: templates/base/images/pending_for_technical_review-32.png
diff -N templates/base/images/pending_for_technical_review-32.png
Binary files /dev/null and /tmp/cvsXBek4D differ
Index: templates/base/images/pending_for_quality_review-32.png
===================================================================
RCS file: templates/base/images/pending_for_quality_review-32.png
diff -N templates/base/images/pending_for_quality_review-32.png
Binary files /dev/null and /tmp/cvsZT5KTE differ
Index: templates/base/images/pending_for_technical_review-48.png
===================================================================
RCS file: templates/base/images/pending_for_technical_review-48.png
diff -N templates/base/images/pending_for_technical_review-48.png
Binary files /dev/null and /tmp/cvsaJ4jMH differ
Index: templates/base/images/pending_for_technical_review-16.png
===================================================================
RCS file: templates/base/images/pending_for_technical_review-16.png
diff -N templates/base/images/pending_for_technical_review-16.png
Binary files /dev/null and /tmp/cvs7c9VpG differ