@@ -75,12 +75,12 @@
-
+
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 118441e4..ab3c3728 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -16,33 +16,33 @@
- Count
+ {{ __("Count") }}
@canany(['admin', 'readwrite'])
- New
+ {{ __('New') }}
@endcanany
@foreach ($categories as $group)
- {{ $group->category }}
+ {{ __($group->category) }}
{{ $group->total }}
@canany(['admin', 'readwrite'])
-
+
+
@endcanany
@@ -54,7 +54,7 @@
+
+ @endif
+
+ @switch( $matter['Cat'])
+ @case('PAT')
+ {{('Patents')}}
+ @break
+ @case('TM')
+ {{('Trademarks')}}
+ @break
+ @case('DM')
+ {{('Design Patents')}}
+ @endswitch
+
+ @php
+ $previous_cat = $matter['Cat'];
+ $new_cat = true;
+ @endphp
+ @endif
+
+ @if (! str_starts_with($matter['Ref'], $previous_family) || $previous_family == "" || $new_cat)
+ @if ($previous_family != "" && ! $new_cat)
+
+
+
+
+ @endif
+
+
+
+
+ @if ( $matter['Title'] !== null)
+
{!! $matter['Title'] !!}
+ @endif
+ @if ( $matter['Title2'] !== null)
+
{!! $matter['Title2'] !!}
+ @endif
+ @if ( $matter['Title3'] !== null)
+
{!! $matter['Title3'] !!}
+ @endif
+
+ {{('Owner:')}} {!! $matter['Applicant'] !!}
+
+ @if ( $matter['Inventor1'] !== "")
+ {{('Inventor:')}} {!! $matter['Inventor1'] !!}
+ @endif
+
+
+
+
+
+ {{('Your ref.')}}
+ {{('Country code')}}
+ {{('Filing')}}
+ {{('Publication')}}
+ {{('Grant')}}
+ {{('Status')}}
+ {{('Next renewal')}}
+ {{('Our ref.')}}
+
+
+
+ @endif
+
+ @php
+ $previous_family = substr($matter['Ref'], 0, strpos($matter['Ref'], $matter['country']));
+ $new_cat = false;
+ @endphp
+
+ {!! $matter['ClRef'] !!}
+ {!! $matter['country'] !!}
+ {!! $matter['FilNo'] !!}{!! empty($matter['Filed'])? "" : Carbon\Carbon::parse($matter['Filed'])->locale('en_US')->isoFormat('LL') !!}
+ {!! $matter['PubNo'] !!}{!! empty($matter['Published'])? "" : Carbon\Carbon::parse($matter['Published'])->locale('en_US')->isoFormat('LL') !!}
+ {!! $matter['GrtNo'] !!}{!! empty($matter['Granted'])? "" : Carbon\Carbon::parse($matter['Granted'])->locale('en_US')->isoFormat('LL') !!}
+
+ @if ( $matter['dead'] == 1 )
+ {{ __('Dead') }} {!! $matter['Status'] !!}
+ @else
+ {!! $matter['Status'] !!}
+ @endif
+
+ {!! empty($matter['next'])? "" : Carbon\Carbon::parse($matter['next'])->locale('en_US')->isoFormat('LL') !!}
+ {!! $matter['Ref'] !!}
+
+ @endif
+ @endforeach
+
+
+
+
+
+
+
+
diff --git a/resources/views/role/create.blade.php b/resources/views/role/create.blade.php
index dc2edbc7..6a0fad39 100644
--- a/resources/views/role/create.blade.php
+++ b/resources/views/role/create.blade.php
@@ -2,34 +2,34 @@
-
Create role
+
{{ __('Create role') }}
diff --git a/resources/views/role/index.blade.php b/resources/views/role/index.blade.php
index 6b994ed7..67197f52 100644
--- a/resources/views/role/index.blade.php
+++ b/resources/views/role/index.blade.php
@@ -2,8 +2,8 @@
@section('content')
- Actor Roles
- Create Role
+ {{ __('Actor Roles') }}
+ {{ __('Create Role') }}
@@ -11,16 +11,16 @@
-
-
- Notes
+
+
+ {{ __('Notes') }}
@foreach ($roles as $role)
-
+
{{ $role->code }}
@@ -35,11 +35,11 @@
- Click on role to view and edit details
+ {{ __('Click on role to view and edit details') }}
diff --git a/resources/views/role/show.blade.php b/resources/views/role/show.blade.php
index 48d3d610..cba0279b 100644
--- a/resources/views/role/show.blade.php
+++ b/resources/views/role/show.blade.php
@@ -1,35 +1,35 @@
-
- Delete
+
+ {{ __('Delete') }}
diff --git a/resources/views/rule/create.blade.php b/resources/views/rule/create.blade.php
index bd3e2d01..60b5e3f8 100644
--- a/resources/views/rule/create.blade.php
+++ b/resources/views/rule/create.blade.php
@@ -1,50 +1,50 @@
diff --git a/resources/views/rule/index.blade.php b/resources/views/rule/index.blade.php
index 54d2d659..7a815dd0 100644
--- a/resources/views/rule/index.blade.php
+++ b/resources/views/rule/index.blade.php
@@ -3,12 +3,12 @@
@section('content')
- Rules
+ {{ __('Rules') }}
- Create Rule
+ {{ __('Create Rule') }}
@@ -16,29 +16,29 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@foreach ($ruleslist as $rule)
-
- {{ $rule->taskInfo->name }}
+
+ {{ __($rule->taskInfo->name) }}
{{ $rule->detail }}
- {{ empty($rule->trigger) ? '' : $rule->trigger->name }}
- {{ empty($rule->category) ? '' : $rule->category->category }}
- {{ empty($rule->country) ? '' : $rule->country->name }}
- {{ empty($rule->origin) ? '' : $rule->origin->name }}
- {{ empty($rule->type) ? '' : $rule->type->type }}
+ {{ empty($rule->trigger) ? '' : __($rule->trigger->name) }}
+ {{ empty($rule->category) ? '' : __($rule->category->category) }}
+ {{ empty($rule->country) ? '' : __($rule->country->iso) }}
+ {{ empty($rule->origin) ? '' : __($rule->origin->iso) }}
+ {{ empty($rule->type) ? '' : __($rule->type->type) }}
@endforeach
@@ -53,11 +53,11 @@
- Click on rule to view and edit details
+ {{ __('Click on rule to view and edit details') }}
diff --git a/resources/views/rule/show.blade.php b/resources/views/rule/show.blade.php
index 2874a623..ef066896 100644
--- a/resources/views/rule/show.blade.php
+++ b/resources/views/rule/show.blade.php
@@ -1,58 +1,58 @@
- Task
+ {{ __('Task') }}
- Triggered by
+ {{ __('Triggered by') }}
- Detail
+ {{ __('Detail') }}
- Category
+ {{ __('Category') }}
- Country
+ {{ __('Country') }}
- Origin
+ {{ __('Origin') }}
- Type
+ {{ __('Type') }}
- Clears task
+ {{ __('Clears task') }}
clear_task ? 'checked' : '' }}>
- Deletes task
+ {{ __('Deletes task') }}
delete_task ? 'checked' : '' }}>
- Enabled
+ {{ __('Enabled') }}
active ? 'checked' : '' }}>
- Notes
+ {{ __('Notes') }}
{{ $ruleInfo->notes }}
@@ -61,45 +61,45 @@
@@ -107,15 +107,15 @@
@@ -128,7 +128,7 @@
-
+
✓
×
diff --git a/resources/views/task/index.blade.php b/resources/views/task/index.blade.php
index 9d051ef1..5f41b3a4 100644
--- a/resources/views/task/index.blade.php
+++ b/resources/views/task/index.blade.php
@@ -2,8 +2,8 @@
@foreach ($tasks as $task)
-
- {{ $task->name }} {{ $task->detail }}
+
+ {{ __($task->name) }} {{ __($task->detail) }}
@@ -17,9 +17,9 @@
{{ $task->due_date->isoFormat('L') }}
@if ($task->due_date < now())
-
+
@elseif ($task->due_date < now()->addWeeks(2))
-
+
@endif
@canany(['admin', 'readwrite'])
diff --git a/resources/views/template-members/create.blade.php b/resources/views/template-members/create.blade.php
index 1f54432a..171372d8 100644
--- a/resources/views/template-members/create.blade.php
+++ b/resources/views/template-members/create.blade.php
@@ -1,14 +1,14 @@
- New template
+ {{ __('New template') }}
- Create template
+ {{ __('Create template') }}
diff --git a/resources/views/template-members/index.blade.php b/resources/views/template-members/index.blade.php
index 8f13cd10..811738cc 100644
--- a/resources/views/template-members/index.blade.php
+++ b/resources/views/template-members/index.blade.php
@@ -2,8 +2,8 @@
@section('content')
- Email Templates
- Create a new member of templates
+ {{ __('Email Templates') }}
+ {{ __('Create a new member of templates') }}
@@ -11,19 +11,19 @@
-
-
-
-
-
-
+
+
+
+
+
+
@foreach ($template_members as $member)
-
+
{{ $member->summary }}
@@ -44,11 +44,11 @@
- Click on member to view and edit details
+ {{ __('Click on member to view and edit details') }}
diff --git a/resources/views/template-members/show.blade.php b/resources/views/template-members/show.blade.php
index 6932051a..d124a9c8 100644
--- a/resources/views/template-members/show.blade.php
+++ b/resources/views/template-members/show.blade.php
@@ -1,41 +1,41 @@
-
- Delete
+
+ {{ __('Delete') }}
diff --git a/resources/views/type/create.blade.php b/resources/views/type/create.blade.php
index 8db3d29d..dc5a2080 100644
--- a/resources/views/type/create.blade.php
+++ b/resources/views/type/create.blade.php
@@ -2,12 +2,12 @@
- Create type
+ {{ __('Create type') }}
diff --git a/resources/views/type/index.blade.php b/resources/views/type/index.blade.php
index bcfd5642..2f9d3bed 100644
--- a/resources/views/type/index.blade.php
+++ b/resources/views/type/index.blade.php
@@ -2,8 +2,8 @@
@section('content')
- Matter Types
- Create Matter Type
+ {{ __('Matter Types') }}
+ {{ __('Create Matter Type') }}
@@ -11,15 +11,15 @@
-
-
+
+
@foreach ($matter_types as $type)
-
+
{{ $type->code }}
@@ -33,11 +33,11 @@
- Click on type to view and edit details
+ {{ __('Click on type to view and edit details') }}
diff --git a/resources/views/type/show.blade.php b/resources/views/type/show.blade.php
index 7a2ab726..d7409c8d 100644
--- a/resources/views/type/show.blade.php
+++ b/resources/views/type/show.blade.php
@@ -1,13 +1,13 @@
-
- Delete
+
+ {{ __('Delete') }}
diff --git a/resources/views/user/create.blade.php b/resources/views/user/create.blade.php
index a129c930..142e6d12 100644
--- a/resources/views/user/create.blade.php
+++ b/resources/views/user/create.blade.php
@@ -1,52 +1,52 @@
- Create
+ {{ __('Create') }}
-
\ No newline at end of file
+
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index 546166e7..70467caa 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -2,8 +2,8 @@
@section('content')
- Users
- Create user
+ {{ __('Users') }}
+ {{ __('Create user') }}
@@ -11,17 +11,17 @@
@foreach ($userslist as $user)
- warn) class="text-danger text-decoration-none" @endif href="/user/{{ $user->id }}" data-panel="ajaxPanel" title="User data">
+ warn) class="text-danger text-decoration-none" @endif href="/user/{{ $user->id }}" data-panel="ajaxPanel" title="{{ __('User data') }}">
{{ $user->name }}
@@ -42,11 +42,11 @@
- Click on user name to view and edit details
+ {{ __('Click on user name to view and edit details') }}
diff --git a/resources/views/user/show.blade.php b/resources/views/user/show.blade.php
index 3534f3fb..d4eabbb4 100644
--- a/resources/views/user/show.blade.php
+++ b/resources/views/user/show.blade.php
@@ -1,35 +1,35 @@
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 93e789ed..94248141 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -4,7 +4,7 @@
-
Laravel
+
PhpIP
@@ -68,12 +68,12 @@
@if (Route::has('login'))
@@ -84,13 +84,13 @@
PhpIP
- IP rights portfolio manager and docketing system
+ {{ __("IP rights portfolio manager and docketing system") }}
diff --git a/routes/web.php b/routes/web.php
index a7b6a9f7..58194e32 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,6 +32,7 @@
->take(15)->get();
});
Route::get('matter/export', 'MatterController@export');
+ Route::get('matter/report', 'MatterController@report');
Route::post('matter/{matter}/mergeFile', 'MatterController@mergeFile');
Route::get('matter/{matter}/events', 'MatterController@events');
Route::get('matter/{matter}/tasks', 'MatterController@tasks');
@@ -94,24 +95,34 @@
$term = $request->term;
$results = App\EventName::select('name as value', 'code as key')
->where([
- ['name', 'like', "$term%"],
['is_task', $is_task],
]);
if ($request->filled('category')) {
$results->whereRaw('ifnull(category, ?) = ?', [$request->category, $request->category]);
}
-
- return $results->take(10)->get();
+ $match_list = Array();
+ foreach($results->get() as $item) {
+ if(str_starts_with(strtolower(__($item["value"])), strtolower($term)) or str_starts_with(strtolower($item["key"]), strtolower($term)) ){
+ $match_item = ["key" => $item["key"], "value" => __($item["value"])];
+ array_push($match_list, $match_item);
+ }
+ }
+ return $match_list;
});
Route::get('classifier-type/autocomplete/{main_display}', function (Request $request, $main_display) {
$term = $request->input('term');
$results = App\ClassifierType::select('type as value', 'code as key')
- ->where('type', 'like', "$term%")
->where('main_display', $main_display)
->orderBy('type');
-
- return $results->take(10)->get();
+ $match_list = Array();
+ foreach($results->get() as $item) {
+ if(str_starts_with(strtolower(__($item["value"])), strtolower($term)) or str_starts_with(strtolower($item["key"]), strtolower($term)) ){
+ $match_item = ["key" => $item["key"], "value" => __($item["value"])];
+ array_push($match_list, $match_item);
+ }
+ }
+ return $match_list;
});
Route::get('user/autocomplete', function (Request $request) {
@@ -130,7 +141,7 @@
->orWhere('display_name', 'like', "$term")
->take(10)->get();
if ($list->count() < 5 && $create_option) {
- $list->push(['label' => "Create $term?", 'key' => 'create', 'value' => $term]);
+ $list->push(['label' => __("Create")." ".$term." ?", 'key' => 'create', 'value' => $term]);
}
return $list;
@@ -139,42 +150,71 @@
Route::get('role/autocomplete', function (Request $request) {
$term = $request->input('term');
- return App\Role::select('name as value', 'code as key', 'shareable')
- ->where('name', 'like', "$term%")
- ->orWhere('code', 'like', "$term%")->get();
+ $full_list = App\Role::select('name as value', 'code as key', 'shareable')->get();
+ $match_list = Array();
+ foreach($full_list as $item) {
+ if(str_starts_with(strtolower(__($item["value"])), strtolower($term)) or str_starts_with(strtolower($item["key"]), strtolower($term)) ){
+ $match_item = ["key" => $item["key"], "shareable" => $item["shareable"], "value" => __($item["value"])];
+ array_push($match_list, $match_item);
+ }
+ }
+ return $match_list;
});
Route::get('dbrole/autocomplete', function (Request $request) {
$term = $request->input('term');
- return App\Role::select('name as value', 'code as key')
- ->where('name', 'like', "$term%")
+ $full_list = App\Role::select('name as value', 'code as key')
->whereIn('code', ['CLI', 'DBA', 'DBRW', 'DBRO'])->get();
+ $match_list = Array();
+ foreach($full_list as $item) {
+ if(str_starts_with(strtolower(__($item["value"])), strtolower($term)) or str_starts_with(strtolower($item["key"]), strtolower($term)) ){
+ $match_item = ["key" => $item["key"], "value" => __($item["value"])];
+ array_push($match_list, $match_item);
+ }
+ }
+ return $match_list;
});
Route::get('country/autocomplete', function (Request $request) {
$term = $request->input('term');
- $list = App\Country::select('name as value', 'iso as key')
- ->where('name', 'like', "$term%")
- ->orWhere('iso', 'like', "$term%")->get();
-
- return $list;
+ $full_list = App\Country::select('name as value', 'iso as key')->get();
+ $match_list = Array();
+ foreach($full_list as $item) {
+ if(str_starts_with(strtolower(__($item["key"])), strtolower($term)) or str_starts_with(strtolower($item["key"]), strtolower($term)) ){
+ $match_item = ["key" => $item["key"], "value" => __($item["key"])];
+ array_push($match_list, $match_item);
+ }
+ }
+ return $match_list;
});
Route::get('category/autocomplete', function (Request $request) {
$term = $request->input('term');
- return App\Category::select('category as value', 'code as key', 'ref_prefix as prefix')
- ->where('category', 'like', "$term%")
- ->orWhere('code', 'like', "$term%")->get();
+ $full_list = App\Category::select('category as value', 'code as key', 'ref_prefix as prefix')->get();
+ $match_list = Array();
+ foreach($full_list as $item) {
+ if(str_starts_with(strtolower(__($item["value"])), strtolower($term)) or str_starts_with(strtolower($item["key"]), strtolower($term)) ){
+ $match_item = ["key" => $item["key"], "prefix" => $item["prefix"], "value" => __($item["value"])];
+ array_push($match_list, $match_item);
+ }
+ }
+ return $match_list;
});
Route::get('type/autocomplete', function (Request $request) {
$term = $request->input('term');
- return App\Type::select('type as value', 'code as key')
- ->where('type', 'like', "$term%")
- ->orWhere('code', 'like', "$term%")->get();
+ $full_list = App\Type::select('type as value', 'code as key')->get();
+ $match_list = Array();
+ foreach($full_list as $item) {
+ if(str_starts_with(strtolower(__($item["value"])), strtolower($term)) or str_starts_with(strtolower($item["key"]), strtolower($term)) ){
+ $match_item = ["key" => $item["key"], "value" => __($item["value"])];
+ array_push($match_list, $match_item);
+ }
+ }
+ return $match_list;
});
Route::get('classifier/{classifier}/img', fn (App\Classifier $classifier) => response($classifier->img)
@@ -185,7 +225,7 @@
$list = App\TemplateMember::select('category as value', 'category as key')
->where('category', 'like', "$term%")->distinct()->get();
if ($list->count() == 0) {
- $list->push(['label' => "Create $term", 'key' => $term, 'value' => $term]);
+ $list->push(['label' => __("Create")." ".$term." ?", 'key' => $term, 'value' => $term]);
}
return $list;
@@ -203,7 +243,7 @@
$list = App\TemplateMember::select('style as value', 'style as key')
->where('style', 'like', "$term%")->distinct()->get();
if ($list->count() == 0) {
- $list->push(['label' => "Create $term", 'key' => $term, 'value' => $term]);
+ $list->push(['label' => __("Create")." ".$term." ?", 'key' => $term, 'value' => $term]);
}
return $list;