fix pdf methoth not showing, add in ObjekteImDetail projekt_methode_id for relation (kick out raumart for relation)
This commit is contained in:
1 parent
d95452bc9d
commit
fe826c3bab
8 files changed
+203
-37
No files matched your search
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Filament\Imports;
|
||||
|
||||
use App\Models\ProjektMethode;
|
||||
use App\Models\ProjektObjekte;
|
||||
use App\Models\ProjektObjekteImDetail;
|
||||
use Filament\Actions\Imports\ImportColumn;
|
||||
@@ -40,9 +41,16 @@ class ProjektObjekteImDetailImporter extends Importer
|
||||
->where('top_nummer', $this->data['top_nummer'])
|
||||
->value('id');
|
||||
|
||||
$projekt_methode_id = ProjektMethode::firstOrNew([
|
||||
'projekte_id' => self::$projekte_id,
|
||||
'raumart' => $this->data['raumart'],
|
||||
]);
|
||||
|
||||
if ($projekt_objekte_id && ProjektObjekteImDetail::where('projekte_id', self::$projekte_id)
|
||||
->where('projekt_objekte_id', $projekt_objekte_id)
|
||||
->where('raumart', $this->data['raumart'])->first()) {
|
||||
->where('projekt_methode_id', $projekt_methode_id)
|
||||
->first()
|
||||
) {
|
||||
self::$count_have++;
|
||||
} else {
|
||||
self::$count_new++;
|
||||
@@ -51,7 +59,7 @@ class ProjektObjekteImDetailImporter extends Importer
|
||||
return ProjektObjekteImDetail::firstOrNew([
|
||||
'projekte_id' => self::$projekte_id,
|
||||
'projekt_objekte_id' => $projekt_objekte_id,
|
||||
'raumart' => $this->data['raumart'],
|
||||
'projekt_methode_id' => $projekt_methode_id,
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user