Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

offer fileupload and comments

Browse Source
This commit is contained in:
theo
2018-01-10 21:09:08 +01:00
parent 6366bbc6a8
commit 665242eb4a
270 changed files with 35840 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/modals/comment_modal.php
+26
View File
@@ -0,0 +1,26 @@
<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="comment-modal">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">toevoegen / wijzigen commentaar</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="row">
<div class="col-xl-12">
<textarea data-bind="froala:comment, froalaOptions:options"></textarea>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-success"
data-bind="click:saveComment">opslaan
</button>
<button type="button" class="btn btn-warning" data-dismiss="modal">annuleren</button>
</div>
</div>
</div>
</div>
application/views/pages/offers_view.php
+53 -8
View File
@@ -14,13 +14,25 @@
</tr>
</thead>
<tbody data-bind="foreach:offers">
<tr>
<td><span data-bind="text:customerName"></span></td>
<td><span data-bind="text:projectNumber"></span></td>
<td><span data-bind="text:startdate"></span></td>
<td><span data-bind="text:acceptance_chance"></span> %</td>
<td><span data-bind="text:accepteddate"></span></td>
<td><span data-bind="text:rejectdate"></span></td>
<tr data-bind="css:{'table-info':$root.selectedRowID() == id}">
<td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:customerName"></span>
</td>
<td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:projectNumber"></span>
</td>
<td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:startdate"></span>
</td>
<td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:acceptance_chance"></span> %
</td>
<td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:accepteddate"></span>
</td>
<td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:rejectdate"></span>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>
<!-- ko if:archive == 'F' -->
@@ -32,7 +44,7 @@
data-bind="click:$root.archiveOffer"></i>
<!-- /ko -->
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removeOffer"></i>
data-bind="click:$root.removeOffer, css:{'whiteish':$root.selectedRowID() == id}"></i>
</td>
</tr>
</tbody>
@@ -66,5 +78,38 @@
</table>
</div>
<div class="col-xl-4">
<div class="upload-btn-wrapper" data-bind="visible:selectedRowID()">
<button class="upload-btn">voeg bestand toe</button>
<input type="file" name="userfile" data-bind="event:{change:addDocument}" id="fileinput"/>
</div>
<ul class="list-group" data-bind="foreach:documents">
<li class="list-group-dividered">
<span class="badge badge-info" style="width:100%; text-align:left;">
<span data-bind="text:fullname"></span> |
<span data-bind="text:uploaddate"></span>
</span>
<span data-bind="text:originalname"></span>
<span style="float:right">
<i class="icon fa-download pointer" data-bind="click:$root.downloadDocument"></i>
<i class="icon fa-trash redish pointer" data-bind="click:$root.removeFile"></i>
</span>
</li>
</ul>
<hr/>
<button data-bind="click:addComment, visible:selectedRowID()" class="upload-btn">
voeg commentaar toe
</button>
<!-- ko foreach: comments -->
<div data-bind="click:$root.editComment" class="pointer">
<span class="badge badge-info" style="width:100%; text-align:left;">
<span data-bind="text:fullname"></span> |
<span data-bind="text:comment_date"></span>
</span>
</div>
<div data-bind="html:comment,click:$root.editComment" class="comment-text pointer"></div>
<!-- /ko -->
</div>
</div>
</div>
application/views/partials/_css.php
+3
View File
@@ -7,6 +7,9 @@
<link rel="stylesheet" href="js/vendor/jquery-ui/jquery-ui.css">
<link rel="stylesheet" href="fonts/font-awesome/font-awesome.min.css">
<link href='js/vendor/froala/css/froala_editor.css' rel='stylesheet' type='text/css' />
<link href='js/vendor/froala/css/froala_style.css' type='text/css' />
<link rel="stylesheet" href="css/vendor/site.min.css">
<link rel="stylesheet" href="css/vendor/plugins/animsition/animsition.css">
application/views/partials/_js.php
+10
View File
@@ -8,6 +8,13 @@
<script src="js/vendor/popper-js/umd/popper.min.js"></script>
<script src="js/vendor/bootstrap/bootstrap.js"></script>
<script src="js/vendor/animsition/animsition.js"></script>
<script src="js/vendor/froala/js/froala_editor.min.js"></script>
<script src="js/vendor/froala/js/plugins/knockout-froala.js"></script>
<!--<script src="js/vendor/mousewheel/jquery.mousewheel.js"></script>-->
<!--<script src="js/vendor/asscrollbar/jquery-asScrollbar.js"></script>-->
<!--<script src="js/vendor/asscrollable/jquery-asScrollable.js"></script>-->
@@ -62,6 +69,7 @@
<script src="js/lib/modules/modals/customerModal.js"></script>
<script src="js/lib/modules/modals/externalModal.js"></script>
<script src="js/lib/modules/modals/offerModal.js"></script>
<script src="js/lib/modules/modals/commentModal.js"></script>
<!---->
<script src="js/lib/dataservices/pageDataservice.js"></script>
@@ -70,4 +78,6 @@
<script src="js/lib/dataservices/externalDataservice.js"></script>
<script src="js/lib/dataservices/rolesDataservice.js"></script>
<script src="js/lib/dataservices/offerDataservice.js"></script>
<script src="js/lib/dataservices/commentsDataservice.js"></script>
<script src="js/lib/dataservices/documentsDataservice.js"></script>
<script src="js/lib/helpers.js"></script>
application/views/partials/_modals.php
+1
View File
@@ -4,6 +4,7 @@ $this->load->view('modals/user_modal');
$this->load->view('modals/customer_modal');
$this->load->view('modals/external_modal');
$this->load->view('modals/offer_modal');
$this->load->view('modals/comment_modal');
$this->load->view('specials/tellme_modal');