This commit is contained in:
2018-04-06 10:48:39 +02:00
parent 6f6cda4125
commit 49bd541cb8
10 changed files with 169 additions and 49 deletions
@@ -21,9 +21,9 @@ class DocumentsController extends MY_Controller {
$this->load->library( $libraries );
}
public function getDocuments( $foreignID, $tablename )
public function getDocuments( $foreignID )
{
$documents = Document::getDocuments( $foreignID, $tablename );
$documents = Document::getDocuments( $foreignID );
$this->json( $documents );
}
+1 -2
View File
@@ -15,7 +15,7 @@ class Document extends BaseModel {
return $this->belongsTo( 'User' );
}
public static function getDocuments( $foreignID, $tablename )
public static function getDocuments( $foreignID)
{
$documents = Document::orderBy( 'uploaddate', 'desc' )
->with( [
@@ -23,7 +23,6 @@ class Document extends BaseModel {
$q->selectRaw( "CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname, id" );
}] )
->whereForeignId( $foreignID )
->whereForeignTable( $tablename )
->get();
return $documents;
@@ -1,43 +1,50 @@
<div class="panel panel-bordered panel-primary panel-line">
<div class="panel-heading panel-heading-project">
<h3 class="">
bestanden
</h3>
<div class="col-md-6">
<table class="table table-condensed">
<thead>
<tr>
<th>door</th>
<th>datum</th>
<th>bestandsnaam</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<tr data-bind="foreach:documents">
<td>
<span data-bind="text:fullname"></span>
</td>
<td>
<span data-bind="text:uploaddate"></span>
</td>
<td>
<span data-bind="text:originalname"></span>
</td>
<td>
<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>
</td>
</tr>
</tbody>
<tr></tr>
</tfoot>
</table>
<div class="upload-btn-wrapper" data-bind="">
<button class="upload-btn">voeg bestand toe</button>
<input type="file" name="userfile" data-bind="event:{change:addDocument}" id="fileinput"/>
</div>
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<tr>
<td colspan="2" class="table-cyanish-header">
offerte bestanden
</td>
</tr>
</thead>
<tbody data-bind="foreach:projectFiles">
<td>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editPayment"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removePayment"></i>
</td>
</tr>
</tbody>
<thead>
<tr>
<th colspan="2" class="table-cyanish-header">
project bestanden
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="2">
</td>
</tr>
</tfoot>
</table>
</div>
<div class="col-md-6">
<hr/>
<!-- <button data-bind="click:addComment" 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>
+1
View File
@@ -8,6 +8,7 @@ $this->load->view('modals/project_modal');
$this->load->view('modals/comment_modal');
$this->load->view('specials/tellme_modal');
$this->load->view('specials/upload_modal');
@@ -0,0 +1,20 @@
<div class="modal fade modal-primary" tabindex="-1" role="dialog" id="upload-bestand">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="upload file">Uploaden bestand</h4>
</div>
<div class="modal-body">
<div class="upload-btn-wrapper">
<button class="upload-btn">Kies bestand</button>
<input type="file" name="myfile" id="file-chooser" />
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">sluit</button>
<button type="button" class="btn btn-primary">uploaden</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->