cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 07:21:05 +03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.willaspace.com/external-projects/cssd-back

Browse Source
This commit is contained in:
sajjad
2023-09-25 02:26:59 -07:00
parent 398d1b6e56 08d7708918
commit 65105f2855
13 changed files with 17 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+3 -4
View File
@@ -6,7 +6,6 @@
use Illuminate\Http\Request;
use App\Http\Requests\StoreItemRequest;
use App\Item;
use App\User;
use Illuminate\Support\Facades\Storage;
class ItemController extends Controller
@@ -29,8 +28,8 @@
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) {
$query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' );
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
} )
->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
$query->where( 'size' , $request->size );
@@ -89,7 +88,7 @@
'unique_id' => $request->unique_id ,
'specific' => $request->specific ,
'note' => $request->note ,
'uid' => $request->uid ,
'udi' => $request->udi ,
'user_id' => auth( 'api' )->user()->id ,
];
$ItemObj = Item::create( $ItemData );
app/Http/Controllers/PackageController.php
+3 -3
View File
@@ -28,8 +28,8 @@
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
$query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
} )
->when( $request->has( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) {
$query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' );
->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
} )
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->package_id );
@@ -73,7 +73,7 @@
'name' => $request->name ,
'unique_id' => $request->unique_id ,
'note' => $request->note ,
'uid' => $request->uid ,
'udi' => $request->udi ,
'user_id' => auth( 'api' )->user()->id ,
'verified' => 'NotVerified' ,
];
app/Http/Controllers/TestResultController.php
+1 -17
View File
@@ -2,21 +2,6 @@
namespace App\Http\Controllers;
<<<<<<< HEAD
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests\StoreTestResultRequest;
use App\TestResult;
use App\InputValue;
use App\Input;
use App\MedicalCenter;
use App\TestType;
use App\Gallery;
use App\Uploadable;
use App\Media;
use Intervention\Image\ImageManagerStatic as Image;
use Intervention\Image\ImageManager;
=======
use App\Http\Requests\StoreTestResultRequest;
use App\Input;
use App\InputValue;
@@ -25,7 +10,6 @@
use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
>>>>>>> b389ea53068b2084084b9704400a50529ba035eb
use Illuminate\Support\Facades\Storage;
class TestResultController extends Controller
@@ -492,7 +476,7 @@
}
$TestResult[ 'filesPath' ] = $FilesPath;
}
// dd($TestResult->test_type()->device_label);
$TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
return \MessageResponse::data( $TestResult );
}
app/Http/Requests/StoreItemRequest.php
+2 -2
View File
@@ -30,7 +30,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required',
'specific' => 'required',
'note' => 'nullable',
'uid' => 'required|max:100|unique:items',
'udi' => 'required|max:100|unique:items',
];
break;
}
@@ -43,7 +43,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required',
'specific' => 'required',
'note' => 'nullable',
'uid' => 'required|max:100|unique:items,uid,'.$Item->id,
'udi' => 'required|max:100|unique:items,udi,'.$Item->id,
];
break;
}
app/Http/Requests/StorePackageRequest.php
+2 -2
View File
@@ -29,7 +29,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages',
'note' => 'nullable',
'items' => 'required',
'uid' => 'required|max:100|unique:packages',
'udi' => 'required|max:100|unique:packages',
];
break;
}
@@ -41,7 +41,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
'note' => 'nullable',
'items' => 'required',
'uid' => 'required|max:100|unique:packages',
'udi' => 'required|max:100|unique:packages',
];
break;
app/Item.php
+1 -1
View File
@@ -6,7 +6,7 @@
class Item extends Model
{
public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'uid' , 'status' ];
public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' ];
public function packages()
{
app/Package.php
+1 -1
View File
@@ -6,7 +6,7 @@
class Package extends Model
{
public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'uid' ];
public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'udi' ];
public function user()
{
database/2019_04_11_105200_create_options_table.php
-34
View File
@@ -1,34 +0,0 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateOptionsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('options', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('title');
$table->unsignedBigInteger('input_id');
$table->foreign('input_id')->references('id')->on('inputs');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('options');
}
}
database/migrations/2023_08_27_124700_update_items_table.php
+2 -2
View File
@@ -14,7 +14,7 @@ class UpdateItemsTable extends Migration
public function up()
{
Schema::table('items', function (Blueprint $table) {
$table->string('uid')->nullable();
$table->string('udi')->nullable();
$table->tinyInteger('status')->default(0);
});
}
@@ -27,7 +27,7 @@ class UpdateItemsTable extends Migration
public function down()
{
Schema::table('items', function (Blueprint $table) {
$table->dropColumn('uid');
$table->dropColumn('udi');
$table->dropColumn('status');
});
}
database/migrations/2023_08_27_124945_update_packages_table.php
+2 -2
View File
@@ -14,7 +14,7 @@ class UpdatePackagesTable extends Migration
public function up()
{
Schema::table('packages', function (Blueprint $table) {
$table->string('uid')->nullable();
$table->string('udi')->nullable();
});
}
@@ -26,7 +26,7 @@ class UpdatePackagesTable extends Migration
public function down()
{
Schema::table('packages', function (Blueprint $table) {
$table->dropColumn('uid');
$table->dropColumn('udi');
});
}
}
database/seeds/AccessSeeder.php
-50
View File
@@ -1,50 +0,0 @@
<?php
use App\User;
use Illuminate\Database\Seeder;
use Spatie\Permission\Models\Permission;
use Spatie\Permission\Models\Role;
class AccessSeeder extends Seeder
{
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
if ( $this->assignAllRoleToAdministrator() ) {
dump( 'Success.' );
} else {
dump( 'Error: Please Check And Run Again.' );
}
}
private function assignAllRoleToAdministrator()
{
$roleModel = new Role();
if ( $roleModel->where( 'name' , 'administrator' )->first() == null ) {
Role::create( [
'name' => 'administrator'
] );
}
// assign role to user id 1
$user = User::find( 1 );
$user->assignRole( 'administrator' );
// get all permission
$permissions = [];
foreach ( Permission::all() as $item ) {
$permissions[ 'permissions' ][ $item ] = "1";
}
// assign all permissions to role administrator
foreach ($permissions['permissions'] as $permission) {
$role = Role::where('id', 1)->first();
$role->syncPermissions(array_keys($permission));
}
return true;
}
}
database/seeds/PermissionSeeder.php
-61
View File
@@ -1,61 +0,0 @@
<?php
use App\Models\User;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Modules\Permission\App\Helper\AccessMain;
use Modules\Permission\App\Helper\PermissionMain;
use Modules\Permission\App\Helper\RoleMain;
use Spatie\Permission\Models\Role;
class PermissionSeeder extends Seeder
{
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
// assign all permissions to role administrator
$permissionMain = New AccessMain();
if($permissionMain->assignAllRoleToAdministrator()){
dump('Success: Created Role Administrator');
// create roles default - admin
$roleMain = new RoleMain();
if($roleMain->getItems()->where('name', 'admin')->first() == null){
if(!$roleMain->storeToDB(['name' => 'admin'])){
dump('Error: Can Not Create Role Admin');
}else{
dump('Success: Created Role Admin');
}
}
// create roles default - user
$roleMain = new RoleMain();
if($roleMain->getItems()->where('name','user')->first() == null){
if(!$roleMain->storeToDB(['name' => 'user'])){
dump('Error: Can Not Create Role User');
}else{
dump('Success: Created Role User');
}
}
// create roles default - caller
$roleMain = new RoleMain();
if($roleMain->getItems()->where('name','caller')->first() == null){
if(!$roleMain->storeToDB(['name' => 'caller'])){
dump('Error: Can Not Create Role Caller');
}else{
dump('Success: Created Role Caller');
}
}
}else{
dump('Error: Please Check And Run Again.');
}
}
}
database/seeds/UserTableSeeder.php
-98
View File
@@ -1,98 +0,0 @@
<?php
use App\User;
use Faker\Factory;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\Hash;
use Ybazli\Faker\Facades\Faker;
class UserTableSeeder extends Seeder
{
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
if ( ! User::count() )
return $this->registerData();
}
public function registerData()
{
$faker = Factory::create();
$user = User::create( [
'is_admin' => 1 ,
'department_id' => 1 ,
'first_name' => 'سیداحمد' ,
'last_name' => 'موسوی' ,
'name_en' => 'Seyyed Ahmad Mousavi' ,
'tel' => '09214309687' ,
'national_code' => '0371661773' ,
'password' => Hash::make( '12345678' ) ,
'birth_date' => '1998/05/22' ,
'marriage_date' => '1998/05/22' ,
] );
if ( $permissions = Department::find( $user->department_id )->permissionsArray ) {
foreach ( $permissions as $permission ) {
UserPermission::create( [
'user_id' => $user->id ,
'permission_id' => $permission ,
] );
};
}
UserPhone::create( [
'user_id' => $user->id ,
'type' => 1 ,
'phone' => '09214309687' ,
] );
$user = User::create( [
'is_admin' => 1 ,
'department_id' => 1 ,
'first_name' => 'حسین' ,
'last_name' => 'بایگان' ,
'name_en' => 'Hossein Bayegan' ,
'tel' => '09021950725' ,
'national_code' => '0371661773' ,
'password' => Hash::make( '12345678' ) ,
'birth_date' => '1998/05/22' ,
'marriage_date' => '1998/05/22' ,
] );
if ( $permissions = Department::find( $user->department_id )->permissionsArray ) {
foreach ( $permissions as $permission ) {
UserPermission::create( [
'user_id' => $user->id ,
'permission_id' => $permission ,
] );
};
}
for ( $i = 0 ; $i < 15 ; $i++ ) {
$tel = Faker::mobile();
$user = User::create( [
'is_admin' => 0 ,
'department_id' => Department::where( 'id' , '!=' , 1 )->inRandomOrder()->first()->id ,
'first_name' => Faker::firstName() ,
'last_name' => Faker::lastName() ,
'tel' => $tel ,
'code' => random_int( 1000 , 9999 ) ,
'national_code' => Faker::melliCode() ,
'password' => Hash::make( '12345678' ) ,
'birth_date' => $faker->date() ,
'marriage_date' => $faker->date() ,
] );
UserPhone::create( [
'user_id' => $user->id ,
'type' => 1 ,
'phone' => $tel ,
] );
}
}
}