Browse Source

bug fix + esg upload award files api

parent
commit
5c6c3728b1

+ 1
- 0
app/Filament/Resources/UploadFileResource.php View File

@@ -40,6 +40,7 @@ class UploadFileResource extends Resource
40 40
                             FileUpload::make("upload_link")->label("上傳檔案")->directory("uploadFiles")->columnSpan(1),
41 41
                         ])->columnSpanFull(),
42 42
                         DatePicker::make("award_date")->label("獲得日期"),
43
+                        TextInput::make('order')->label("排序")->default("0")
43 44
                     ])->columns(4)->columnSpanFull(),
44 45
                 ])
45 46
             ]);

+ 5
- 1
app/Http/Controllers/Api/EsgController.php View File

@@ -41,7 +41,11 @@ class EsgController extends Controller
41 41
     public function uploadFiles($locale = "tw")
42 42
     {
43 43
         $locale = $locale == "tw" ? "zh_TW" : $locale;
44
-        $fileList = UploadFile::where("type", 1)->select("upload_link", "award_date")->get()->map(function ($record) {
44
+        $request_ordering = $request->ordering ?? "desc";
45
+        $fileList = UploadFile::where("type", 1)
46
+                                        ->select("upload_link", "award_date")
47
+                                        ->orderBy("award_date", $request_ordering)
48
+                                        ->orderBy("order", $request_ordering)->get()->map(function ($record) {
45 49
             return [
46 50
                 "uploadLink" => $record->upload_link,
47 51
                 "awardDate" => "獲頒日期 : " . date("Y/m/d", strtotime($record->award_date))