|
@@ -153,6 +153,12 @@ class SentenceController extends Controller
|
|
|
$table = Sentence::where('book_id',$request->get('book'))
|
|
$table = Sentence::where('book_id',$request->get('book'))
|
|
|
->whereBetween('paragraph',$chapter)
|
|
->whereBetween('paragraph',$chapter)
|
|
|
->whereIn('channel_uid',explode(',',$request->get('channels')));
|
|
->whereIn('channel_uid',explode(',',$request->get('channels')));
|
|
|
|
|
+ break;
|
|
|
|
|
+ case 'paragraph':
|
|
|
|
|
+ $table = Sentence::where('book_id',$request->get('book'))
|
|
|
|
|
+ ->whereIn('paragraph',explode(',',$request->get('para')))
|
|
|
|
|
+ ->whereIn('channel_uid',explode(',',$request->get('channels')))
|
|
|
|
|
+ ->orderBy('book_id')->orderBy('paragraph')->orderBy('word_start');
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|
|
|
# code...
|
|
# code...
|
|
@@ -162,7 +168,11 @@ class SentenceController extends Controller
|
|
|
if($request->get('strlen',false)){
|
|
if($request->get('strlen',false)){
|
|
|
$totalStrLen = $table->sum('strlen');
|
|
$totalStrLen = $table->sum('strlen');
|
|
|
}
|
|
}
|
|
|
- $table = $table->orderBy($request->get('order','updated_at'),$request->get('dir','desc'));
|
|
|
|
|
|
|
+ if($request->get('view') !== 'paragraph'){
|
|
|
|
|
+ $table = $table->orderBy($request->get('order','updated_at'),
|
|
|
|
|
+ $request->get('dir','desc'));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$table = $table->skip($request->get("offset",0))
|
|
$table = $table->skip($request->get("offset",0))
|
|
|
->take($request->get('limit',1000));
|
|
->take($request->get('limit',1000));
|
|
|
$result = $table->get();
|
|
$result = $table->get();
|
|
@@ -170,7 +180,8 @@ class SentenceController extends Controller
|
|
|
if($result){
|
|
if($result){
|
|
|
$output = ["count"=>$count];
|
|
$output = ["count"=>$count];
|
|
|
if($request->get('view') === 'sent-can-read' ||
|
|
if($request->get('view') === 'sent-can-read' ||
|
|
|
- $request->get('view') === 'chapter'){
|
|
|
|
|
|
|
+ $request->get('view') === 'chapter' ||
|
|
|
|
|
+ $request->get('view') === 'paragraph'){
|
|
|
$output["rows"] = SentResource::collection($result);
|
|
$output["rows"] = SentResource::collection($result);
|
|
|
}else{
|
|
}else{
|
|
|
$output["rows"] = $result;
|
|
$output["rows"] = $result;
|