Bladeren bron

Budget detailed view: fix order, update style

Piotr Labudda 10 jaren geleden
bovenliggende
commit
b2cfe18166
1 gewijzigde bestanden met toevoegingen van 14 en 7 verwijderingen
  1. 14 7
      SE/se-lib/Route/Budget.php

+ 14 - 7
SE/se-lib/Route/Budget.php

@@ -319,10 +319,16 @@ jQuery(document).ready(function() {
 		</div>
 	</div>
 	<table id="proj-koresp-info" style="display:none">
-		<?php foreach ($this->_costs as $projId => $projectInfo) : ?>
-			<?php $projectID   = $projId; ?>
-			<?php $projectDesc = $this->_projectInfo[$projId]->M_DIST_DESC; ?>
-			<?php $projectPath = $this->_projectInfo[$projId]->path; ?>
+		<?php foreach ($this->_projectPathsOrder as $projPath => $projId) : ?>
+			<?php
+				$projectInfo = $this->_costs[$projId];
+				if (!$projectInfo) {
+					continue;
+				}
+				$projectID   = $projId;
+				$projectDesc = $this->_projectInfo[$projId]->M_DIST_DESC;
+				$projectPath = $this->_projectInfo[$projId]->path;
+			?>
 			<?php if (!empty($projectInfo->korespByMonth)) : ?>
 				<?php foreach ($projectInfo->korespByMonth as $kMonth => $vKorespMonthList) : ?>
 					<tbody id="row-proj-<?php echo $projectID; ?>-koresp-by-month-<?php echo $kMonth; ?>"
@@ -330,10 +336,11 @@ jQuery(document).ready(function() {
 								 data-proj_path="<?php echo $projectPath; ?>"
 								 data-proj_id="<?php echo $projectID; ?>">
 						<tr>
-							<td style="padding:3px;font-size:1em;background:#eee;"><?php echo $projectPath; ?></td>
-							<td colspan="3" style="padding:3px;font-size:1.2em;background:#eee;">
-								Koszty projektu nr <?php echo $projectID; ?>
+							<td style="padding:3px;font-size:1em;background:#eee;"><nobr><?php echo $projectPath; ?></nobr></td>
+							<td colspan="3" style="padding:3px;font-size:1.1em;background:#eee;max-width:500px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<?php echo $projectDesc; ?>">
+								<!-- Koszty projektu nr <?php echo $projectID; ?> -->
 								<!-- - miesiąc <?php echo $year; ?>-<?php echo sprintf("%02d", $kMonth); ?> -->
+								<?php echo $projectDesc; ?>
 							</td>
 						</tr>
 						<?php foreach ($vKorespMonthList as $kKorespIdx => $vKorespInfo) : ?>