ProVM/contabilidad
2
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixes for uploaded files

Browse Source
This commit is contained in:
Aldarien
2021-12-23 00:10:06 -03:00
parent aacda4d1e4 9e29dd09b7
commit f9bbbfd920
6 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/.gitignore generated vendored
View File

@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/

5
.idea/codeStyles/codeStyleConfig.xml generated
View File

@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

8
.idea/modules.xml generated
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/contabilidad.iml" filepath="$PROJECT_DIR$/.idea/contabilidad.iml" />
</modules>
</component>
</project>

3
api/common/Controller/Files.php
View File

@ -52,8 +52,7 @@ class Files {
public function edit(Request $request, Response $response, Handler $handler, Factory $factory, $folder, $filename): Response {
$post = json_decode($request->getBody());
$cuenta = $factory->find(Cuenta::class)->one($post->cuenta);
$filenfo = $handler->getInfo($folder, $filename);
$new_name = implode('.', [implode(' - ', [$cuenta->nombre, $cuenta->categoria()->nombre, $post->fecha]), $filenfo->getExtension()]);
$new_name = implode(' - ', [$cuenta->nombre, $cuenta->categoria()->nombre, $post->fecha]);
$output = [
'input' => [
'folder' => $folder,

2
api/common/Service/FileHandler.php
View File

@ -42,7 +42,7 @@ class FileHandler {
if ($file->getError() !== UPLOAD_ERR_OK) {
return false;
}
if (!in_array($file->getClientMediaType(), array_keys($this->valid_types))) {
if (!in_array($file->getClientMediaType(), $this->valid_types)) {
return false;
}
if ($new_name === null) {

12
ui/public/assets/scripts/uploads.list.js
View File

@ -90,6 +90,7 @@ const archivos = {
if (data.files === null || data.files.length === 0) {
return
}
this.archivos = []
$.each(data.files, (i, el) => {
const arch = new Archivo(el)
arch.setModal(this.modals.edit)
@ -106,20 +107,21 @@ const archivos = {
},
draw: function() {
const tbody = this.get().parent()
tbody.html('')
tbody.empty()
$.each(this.archivos, (i, el) => {
tbody.append(el.draw())
})
},
add: function() {
this.modals.add.find('form').trigger('reset')
this.modals.add.find("[name='cuenta']").dropdown('clear')
this.modals.add.modal('show')
},
doAdd: function() {
const data = new FormData(this.modals.add.find('form'))
return sendPost(_urls.api + '/categorias/add', data, true).then((resp) => {
const data = new FormData(this.modals.add.find('form')[0])
return sendPost(_urls.api + '/uploads/add', data, true).then((resp) => {
this.modals.add.modal('hide')
this.getCategorias()
this.get().archivos()
})
},
doEdit: function() {
@ -149,7 +151,7 @@ const archivos = {
date: function(date, settings) {
if (!date) return ''
const year = date.getFullYear()
const month = date.getMonth() + 1
const month = (date.getMonth() + 1).toString().padStart(2, '0')
return [year, month].join('-')
}
}