Merge pull request #1856 from visuddhinanda/laravel

add url in NotificationResource.php

app/Http/Controllers/SentPrController.php

@@ -242,9 +242,14 @@ class SentPrController extends Controller
      * @param  \App\Models\SentPr  $sentPr
      * @return \Illuminate\Http\Response
      */
-    public function show(SentPr $sentPr)
+    public function show(string $uid)
     {
         //
+        $pr = SentPr::where('uid',$uid)->first();
+        if(!$pr){
+            return $this->error('no data',404,404);
+        }
+        return $this->ok(new SentPrResource($pr));
     }
 
     /**

app/Http/Resources/NotificationResource.php

@@ -4,6 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Api\UserApi;
+use App\Models\SentPr;
 
 class NotificationResource extends JsonResource
 {
@@ -28,6 +29,23 @@ class NotificationResource extends JsonResource
             "created_at"=> $this->created_at,
             "updated_at"=> $this->updated_at,
         ];
+
+        switch ($this->res_type) {
+            case 'suggestion':
+                $prData = SentPr::where('uid',$this->res_id)->first();
+                if($prData){
+                    $link = config('app.url')."/pcd/article/para/{$prData->book_id}-{$prData->paragraph}";
+                    $link .= "?book={$prData->book_id}&par={$prData->paragraph}&channel={$prData->channel_uid}";
+                    $link .= "&mode=edit&pr=".$this->res_id;
+                    $data['url'] = $link;
+                }
+
+                break;
+
+            default:
+                # code...
+                break;
+        }
         return $data;
     }
 }

app/Tools/CaseEnding.php

@@ -3201,6 +3201,7 @@ class CaseEnding{
 		["ṃ","nti",'iti'],
 		["a","āti",'iti'],
 		["ā","āti",'iti'],
+        ["e","eti",'iti'],
 		["ī","īti",'iti'],
 		["i","īti",'iti'],
 		["o","oti",'iti'],
@@ -3212,7 +3213,6 @@ class CaseEnding{
 		["ī","īpi",'api'],
 		["i","īpi",'api'],
 		["o","opi",'api'],
-		["e","epi",'api'],
 		["ū","upi",'api'],
 		["u","upi",'api'],
 		["ṃ","mpi",'api'],

public/dicttext/zh/my-han/index.ini

@@ -10,7 +10,7 @@ year = 1980
 url = ""
 author = ""
 uuid = "8e768332-7a5b-46c2-9ec3-1178167a18b5"
-rows = 40231
+rows = 47259
 [cols]
 force = "true"
 source = "_PAPER_"

public/dicttext/zh/my-han2/index.ini

@@ -10,7 +10,7 @@ year = 1980
 url = ""
 author = ""
 uuid = "8ae6e0f5-f04c-49fc-a355-4885cc08b4b3"
-rows = 40231
+rows = 47259
 [cols]
 force = "true"
 source = "_PAPER_"