1 files changed, 50 insertions, 22 deletions
diff --git a/list_movements.php b/list_movements.php
index 1172fd3..700c824 100644
--- a/list_movements.php
+++ b/list_movements.php
@@ -11,34 +11,62 @@ global $gBitSystem, $gBitSmarty, $gBitDb;
 
 $gBitSystem->verifyPermission( 'p_stock_view' );
 
-$componentContentId = isset( $_REQUEST['component_content_id'] ) && is_numeric( $_REQUEST['component_content_id'] )
-	? (int)$_REQUEST['component_content_id'] : null;
+$partContentId = isset( $_REQUEST['part_content_id'] ) && is_numeric( $_REQUEST['part_content_id'] )
+	? (int)$_REQUEST['part_content_id'] : null;
+
+$partTitle = '';
+$partType  = '';
+$partSize  = null;
+if( $partContentId ) {
+	$pRow = $gBitDb->getRow(
+		"SELECT `title`, `content_type_guid` FROM `".BIT_DB_PREFIX."liberty_content` WHERE `content_id` = ?",
+		[ $partContentId ]
+	);
+	$partTitle = $pRow['title'] ?? '';
+	$partType  = match( $pRow['content_type_guid'] ?? '' ) {
+		'stockassembly'  => 'assembly',
+		'stockcomponent' => 'component',
+		default          => '',
+	};
+	if( $partType === 'component' ) {
+		$ps = $gBitDb->getOne(
+			"SELECT CAST(x.`xkey` AS DOUBLE PRECISION) FROM `".BIT_DB_PREFIX."liberty_xref` x
+			 WHERE x.`content_id` = ? AND x.`item` = 'PRT'",
+			[ $partContentId ]
+		);
+		$partSize = $ps ? (float)$ps : null;
+	}
+}
+
+$listHash = $_REQUEST;
+if( $partContentId && $partType === 'assembly' ) {
+	$listHash['assembly_content_id'] = $partContentId;
+} elseif( $partContentId && $partType === 'component' ) {
+	$listHash['component_content_id'] = $partContentId;
+}
+unset( $listHash['part_content_id'] );
 
 $movement     = new StockMovement();
-$listHash     = $_REQUEST;
 $movementList = $movement->getList( $listHash );
 
-$componentTitle = '';
-$partSize       = null;
-if( $componentContentId ) {
-	$componentTitle = $gBitDb->getOne(
-		"SELECT `title` FROM `".BIT_DB_PREFIX."liberty_content` WHERE `content_id` = ?",
-		[ $componentContentId ]
-	) ?: '';
-	$ps = $gBitDb->getOne(
-		"SELECT CAST(x.`xkey` AS DOUBLE PRECISION) FROM `".BIT_DB_PREFIX."liberty_xref` x
-		 WHERE x.`content_id` = ? AND x.`item` = 'PRT'",
-		[ $componentContentId ]
+$filterUserId   = isset( $_REQUEST['user_id'] ) && is_numeric( $_REQUEST['user_id'] ) ? (int)$_REQUEST['user_id'] : null;
+$filterUserName = '';
+if( $filterUserId ) {
+	$uRow = $gBitDb->getRow(
+		"SELECT `login`, `real_name` FROM `".BIT_DB_PREFIX."users_users` WHERE `user_id` = ?",
+		[ $filterUserId ]
 	);
-	$partSize = $ps ? (float)$ps : null;
+	$filterUserName = $uRow['real_name'] ?: $uRow['login'] ?: '';
 }
 
-$gBitSmarty->assign( 'listInfo',           $listHash['listInfo'] );
-$gBitSmarty->assign( 'movementList',       $movementList );
-$gBitSmarty->assign( 'filterType',         $_REQUEST['ref_type'] ?? '' );
-$gBitSmarty->assign( 'assemblyContentId',  isset( $_REQUEST['assembly_content_id'] ) && is_numeric( $_REQUEST['assembly_content_id'] ) ? (int)$_REQUEST['assembly_content_id'] : null );
-$gBitSmarty->assign( 'componentContentId', $componentContentId );
-$gBitSmarty->assign( 'componentTitle',     $componentTitle );
-$gBitSmarty->assign( 'partSize', $partSize );
+$gBitSmarty->assign( 'listInfo',       $listHash['listInfo'] );
+$gBitSmarty->assign( 'movementList',   $movementList );
+$gBitSmarty->assign( 'filterType',     $_REQUEST['ref_type'] ?? '' );
+$gBitSmarty->assign( 'partContentId',  $partContentId );
+$gBitSmarty->assign( 'partTitle',      $partTitle );
+$gBitSmarty->assign( 'partType',       $partType );
+$gBitSmarty->assign( 'partSize',       $partSize );
+$gBitSmarty->assign( 'filterUserId',   $filterUserId );
+$gBitSmarty->assign( 'filterUserName', $filterUserName );
 
 $gBitSystem->display( 'bitpackage:stock/list_movements.tpl', 'Movements', [ 'display_mode' => 'list' ] );