Skip to content

Commit

Permalink
Fixed importer vue code for niceer layout
Browse files Browse the repository at this point in the history
  • Loading branch information
snipe committed Apr 6, 2020
1 parent d7873f2 commit 0d3c18d
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 8,725 deletions.
605 changes: 5 additions & 600 deletions public/css/build/all.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/dist/all.css

Large diffs are not rendered by default.

8,072 changes: 26 additions & 8,046 deletions public/js/build/all.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/build/vue.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/build/vue.js.map

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions public/js/dist/all.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"/js/build/vue.js": "/js/build/vue.js?id=96f90510b797ac27a94b",
"/js/build/vue.js": "/js/build/vue.js?id=d56de5a98803eaa78eda",
"/css/AdminLTE.css": "/css/AdminLTE.css?id=5e72463a66acbcc740d5",
"/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
"/css/overrides.css": "/css/overrides.css?id=2d81c3704393bac77011",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=423f16f63b86abd6b196",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=bd9e0251bec521f1d018",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=0be7790b84909dca6a0a",
"/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
"/css/overrides.css.map": "/css/overrides.css.map?id=f7ce9ca49027594ac402",
"/css/dist/all.css": "/css/dist/all.css?id=98db4e9b7650453c8b00",
"/js/dist/all.js": "/js/dist/all.js?id=bf1b244d8cc9096e4a18",
"/js/dist/all.js": "/js/dist/all.js?id=ab131b69f6d45367c0aa",
"/css/build/all.css": "/css/build/all.css?id=98db4e9b7650453c8b00",
"/js/build/all.js": "/js/build/all.js?id=bf1b244d8cc9096e4a18"
}
"/js/build/all.js": "/js/build/all.js?id=ab131b69f6d45367c0aa"
}
97 changes: 47 additions & 50 deletions resources/assets/js/components/importer/importer-file.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@ tr {
</style>

<template>
<tr v-show="processDetail">
<td colspan="5">
<div class="col-md-2 text-left">
</div>
<div class="col-md-8 col-md-offset-2 text-center" style="padding-top: 30px; margin: 0 auto;">
<div class="col-md-12 text-left">
<div v-show="processDetail">

<h4 class="modal-title">Import File:</h4>
<div class="dynamic-form-row">
<div class="row">
<div class="col-md-2"></div>
<div class="col-md-8" style="padding-top: 30px; margin: 0 auto;">
<div class="dynamic-form-row">
<div class="col-md-5 col-xs-12">
<label for="import-type">Import Type:</label>
</div>
Expand All @@ -40,59 +37,59 @@ tr {
</div>
</div>
</div>
<div class="alert col-md-12" style="text-align:left"
<div class="alert col-md-8 col-md-offset-2" style="text-align:left"
:class="alertClass"
v-if="statusText">
{{ this.statusText }}
</div>
</div>
<div class="row">
<div class="col-md-2"></div>
<div class="col-md-8" style="padding-top: 30px;">
<div class="col-md-4 text-right"><h4>Header Field</h4></div>
<div class="col-md-4"><h4>Import Field</h4></div>
<div class="col-md-4"><h4>Sample Value</h4></div>
</div>
</div>


<div class="text-left" style="padding-top: 30px;">
<table class="table table-striped snipe-table">
<thead>
<th>Header Field</th>
<th>Import Field</th>
<th>Sample Value</th>
</thead>
<tbody>
<template v-for="(header, index) in file.header_row">
<tr>
<td>
<label :for="header" class="controllabel">{{ header }}</label>
</td>
<td>
<div required>
<select2 :options="columns" v-model="columnMappings[header]">
<option value="0">Do Not Import</option>
</select2>
<template v-for="(header, index) in file.header_row">
<div class="row">
<div class="col-md-2"></div>
<div class="col-md-8">
<div class="col-md-4 text-right">
<label :for="header" class="control-label">{{ header }}</label>
</div>
<div class="col-md-4 form-group">
<div required>
<select2 :options="columns" v-model="columnMappings[header]">
<option value="0">Do Not Import</option>
</select2>
</div>
</div>
<div class="col-md-4">
<p class="form-control-static">{{ activeFile.first_row[index] }}</p>
</div>
</div>
</td>
<td>
<div>{{ activeFile.first_row[index] }}</div>
</td>
</tr>
</template>
</tbody>
</table>
<br>
<div class="col-md-8 col-md-offset-2 text-right">
<button type="button" class="btn btn-sm btn-default" @click="processDetail = false">Cancel</button>
<button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
<br><br>
</div>
</div>
</template>

<div class="alert col-md-12" style="padding-top: 20px;"
:class="alertClass"
v-if="statusText">
{{ this.statusText }}
<div class="row">
<div class="col-md-6 col-md-offset-2 text-right" style="padding-top: 20px;">
<button type="button" class="btn btn-sm btn-default" @click="processDetail = false">Cancel</button>
<button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
<br><br>
</div>
</div>

<div class="row">
<div class="alert col-md-8 col-md-offset-2" style="padding-top: 20px;"
:class="alertClass"
v-if="statusText">
{{ this.statusText }}
</div>
</div>
</div>

</td>

</tr>
</div>
</template>

<script>
Expand Down

0 comments on commit 0d3c18d

Please sign in to comment.