Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Classes/ModuleConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public static function convertToArray(Module $module): array
'sourceDir' => $module->getSourceDir(),
'sourceMmlcDir' => $module->getSourceMmlcDir(),
'version' => $module->getVersion(),
'date' => $module->getDate(),
'shortDescription' => $module->getShortDescription(),
'description' => $module->getDescription(),
'developer' => $module->getDeveloper(),
Expand Down
1 change: 1 addition & 0 deletions src/Classes/ModuleFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public static function createFromArray(array $array): Module
$module->setSourceDir($array['sourceDir'] ?? self::DIR_MODULE_SRC);
$module->setSourceMmlcDir($array['sourceMmlcDir'] ?? self::DIR_MODULE_SRC_MMLC);
$module->setVersion($array['version'] ?? 'auto');
$module->setDate($array['date'] ?? 'unknown');
$module->setShortDescription($array['shortDescription'] ?? '');
$module->setDescription($array['description'] ?? '');
$module->setDeveloper($array['developer'] ?? '');
Expand Down
17 changes: 17 additions & 0 deletions src/Classes/ModuleInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ class ModuleInfo
*/
protected $version;

/**
* Beispiel: 2023-06-20 19:42:32
*
* @var string
*/
protected $date;

/**
* Eine Kurzbeschreibung des Moduls in menschen lesbarer Form.
*
Expand Down Expand Up @@ -247,6 +254,16 @@ public function setVersion(string $value): void
$this->version = $value;
}

public function getDate(): string
{
return $this->date;
}

public function setDate(string $value): void
{
$this->date = $value;
}

public function getShortDescription(): string
{
return $this->shortDescription;
Expand Down
27 changes: 27 additions & 0 deletions src/Classes/ModuleSorter.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,31 @@ public static function sortByVersion(array $modules): array
});
return $modules;
}

/**
* @param Module[] $modules
* @return Module[] Return a array of modules sorted by version.
*/
public static function sortByDate(array $modules): array
{
usort($modules, function (Module $moduleA, Module $moduleB): int {
$dateA = $moduleA->getDate();
if ($dateA === 'unknown') {
$dateA = '0000-00-00 00:00:00';
}

$dateB = $moduleB->getDate();
if ($dateB === 'unknown') {
$dateB = '0000-00-00 00:00:00';
}

if ($dateA < $dateB) {
return 1;
} elseif ($dateA > $dateB) {
return -1;
}
return 0;
});
return $modules;
}
}
5 changes: 5 additions & 0 deletions src/Classes/ViewModels/ModuleViewModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ public function getVersion(): string
return $this->module->getVersion();
}

public function getDate(): string
{
return $this->module->getDate();
}

public function isRemote(): bool
{
return $this->module->isRemote();
Expand Down
9 changes: 8 additions & 1 deletion src/Templates/ModuleInfo.tmpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,11 @@
<td><?= $moduleView->getVersion(); ?></td>
</tr>

<tr>
<td>Datum</td>
<td><?= $moduleView->getDate(); ?></td>
</tr>

<tr>
<td>Kompatibel mit Modified</td>
<td>
Expand Down Expand Up @@ -332,7 +337,9 @@
<td>Alle Versionen</td>
<td>
<?php foreach ($module->getVersions() as $moduleVersion) {?>
<a href="?action=moduleInfo&archiveName=<?= $moduleVersion->getArchiveName() ?>&version=<?= $moduleVersion->getVersion()?>"><?= $moduleVersion->getVersion(); ?></a>
<a href="?action=moduleInfo&archiveName=<?= $moduleVersion->getArchiveName() ?>&version=<?= $moduleVersion->getVersion()?>">
<?= $moduleVersion->getVersion(); ?>
</a>
<?php if ($moduleVersion->isInstalled()) { ?>
<span>installiert</span>
<?php } elseif ($moduleVersion->isLoaded()) { ?>
Expand Down
2 changes: 2 additions & 0 deletions src/Templates/ModuleListing.tmpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use RobinTheHood\ModifiedModuleLoaderClient\ModuleStatus;
use RobinTheHood\ModifiedModuleLoaderClient\Category;
use RobinTheHood\ModifiedModuleLoaderClient\ModuleSorter;
use RobinTheHood\ModifiedModuleLoaderClient\Notification;
use RobinTheHood\ModifiedModuleLoaderClient\ViewModels\NotificationViewModel;

Expand Down Expand Up @@ -35,6 +36,7 @@
<h2><?= Category::getCategoryName($category); ?></h2>
<div class="category">
<?php
$modules = ModuleSorter::sortByDate($modules);
foreach ($modules as $module) {
if ($module->getVisibility() == 'hidden') {
continue;
Expand Down