DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added address, city, state, country to user importer

Browse source
This commit is contained in:
snipe 2020-07-21 16:49:38 -07:00
parent 4f76cc6cfb
commit c17a06792a
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
8 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Importer/Importer.php
View file

@ -63,6 +63,10 @@ abstract class Importer
'full_name' => 'full name', 'full_name' => 'full name',
'email' => 'email', 'email' => 'email',
'username' => 'username', 'username' => 'username',
'address' => 'address',
'city' => 'city',
'state' => 'state',
'country' => 'country',
'jobtitle' => 'job title', 'jobtitle' => 'job title',
'employee_num' => 'employee number', 'employee_num' => 'employee number',
'phone_number' => 'phone number', 'phone_number' => 'phone number',

4
app/Importer/UserImporter.php
View file

@ -47,6 +47,10 @@ class UserImporter extends ItemImporter
$this->item['email'] = $this->findCsvMatch($row, 'email'); $this->item['email'] = $this->findCsvMatch($row, 'email');
$this->item['phone'] = $this->findCsvMatch($row, 'phone_number'); $this->item['phone'] = $this->findCsvMatch($row, 'phone_number');
$this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle'); $this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle');
$this->item['address'] = $this->findCsvMatch($row, 'address');
$this->item['city'] = $this->findCsvMatch($row, 'city');
$this->item['state'] = $this->findCsvMatch($row, 'state');
$this->item['country'] = $this->findCsvMatch($row, 'country');
$this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0; $this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0;
\Log::debug('UserImporter.php Activated: '.$this->findCsvMatch($row, 'activated')); \Log::debug('UserImporter.php Activated: '.$this->findCsvMatch($row, 'activated'));

BIN
public/js/build/all.js
View file

Binary file not shown.

BIN
public/js/build/vue.js
View file

Binary file not shown.

BIN
public/js/build/vue.js.map
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

8
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{ {
"/js/build/vue.js": "/js/build/vue.js?id=461ae9803574a5a52d43", "/js/build/vue.js": "/js/build/vue.js?id=aff26ce7202625817ca1",
"/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545", "/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545",
"/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405", "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
"/css/overrides.css": "/css/overrides.css?id=d1fe6296eb548247a5ad", "/css/overrides.css": "/css/overrides.css?id=d1fe6296eb548247a5ad",
@ -18,7 +18,7 @@
"/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4", "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4",
"/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860", "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860",
"/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438", "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=1760ae00d44238e44172", "/js/build/vue.js.map": "/js/build/vue.js.map?id=41a870ef3b9b5c6688ca",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2",
"/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16", "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
"/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b", "/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b",
@ -38,7 +38,7 @@
"/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29", "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29",
"/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e", "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e",
"/css/dist/all.css": "/css/dist/all.css?id=0491555899142b86167d", "/css/dist/all.css": "/css/dist/all.css?id=0491555899142b86167d",
"/js/dist/all.js": "/js/dist/all.js?id=4513ccdd4533b52922a8", "/js/dist/all.js": "/js/dist/all.js?id=5ac062af7b26fb838213",
"/css/build/all.css": "/css/build/all.css?id=0491555899142b86167d", "/css/build/all.css": "/css/build/all.css?id=0491555899142b86167d",
"/js/build/all.js": "/js/build/all.js?id=4513ccdd4533b52922a8" "/js/build/all.js": "/js/build/all.js?id=5ac062af7b26fb838213"
} }

4
resources/assets/js/components/importer/importer-file.vue
View file

@ -169,6 +169,10 @@
{id: 'manager_first_name', text: 'Manager First Name' }, {id: 'manager_first_name', text: 'Manager First Name' },
{id: 'manager_last_name', text: 'Manager Last Name' }, {id: 'manager_last_name', text: 'Manager Last Name' },
{id: 'activated', text: 'Activated' }, {id: 'activated', text: 'Activated' },
{id: 'address', text: 'Address' },
{id: 'city', text: 'City' },
{id: 'state', text: 'State' },
{id: 'country', text: 'Country' },
], ],
customFields: this.customFields, customFields: this.customFields,