Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ivan c #130

Open
wants to merge 159 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
7f4a486
agregado travis en el gemfile
AlexBono97 Jun 5, 2018
42ab506
Changes en el model y view de Batch
EstherClaudino1 Jun 5, 2018
d1f84c2
Merge branch 'Alexander' of https://github.com/fvillalobos14/chocolat…
EstherClaudino1 Jun 5, 2018
992862d
Disenando el view V1
AlexBono97 Jun 10, 2018
2809ecb
Avances
AlexBono97 Jun 11, 2018
b5da8db
Merge remote-tracking branch 'origin/Esther' into TestMerge
AlexBono97 Jun 11, 2018
1c0be68
Arreglar discrepancias por merge
AlexBono97 Jun 11, 2018
460502d
parte visual finalizada
AlexBono97 Jun 12, 2018
9789a94
parte visual finalizadav2
AlexBono97 Jun 12, 2018
ba81cb5
Checklist for files added
EstherClaudino1 Jun 14, 2018
3278389
changes on the checklist appeareance and model
EstherClaudino1 Jun 14, 2018
ce3ee58
Generacion de Codigo de
lourdeszamora Jun 14, 2018
6fb0b13
Merge branch 'Esther' of https://github.com/fvillalobos14/chocolatsha…
lourdeszamora Jun 14, 2018
740b9a8
Codigo de barra agregado
fvillalobos14 Jun 14, 2018
dffdcbf
Codigo de barra ahora es visible en distintos usuarioS
fvillalobos14 Jun 14, 2018
634382d
Fixed issues with checklist not showing and issues with the code gene…
EstherClaudino1 Jun 14, 2018
491f02a
Fixed more issues with code generation
EstherClaudino1 Jun 14, 2018
1b4c7cd
fixed some issues with reports
EstherClaudino1 Jun 24, 2018
d354a62
Inventory
EstherClaudino1 Jun 27, 2018
29a5750
Fixed nil issues in Inventory
EstherClaudino1 Jun 27, 2018
6330e9e
Design fixes
EstherClaudino1 Jun 27, 2018
1987ebd
Inventory ready
EstherClaudino1 Jun 27, 2018
5cb9371
cambios en views
AlexBono97 Jun 27, 2018
d481bae
Mostrar lista de controles de ingreso
lourdeszamora Jun 27, 2018
f047721
merge with Esther
AlexBono97 Jun 27, 2018
4bfc433
agregado la columna de convertir de libras a kg
AlexBono97 Jun 27, 2018
e13816a
Graficas
fvillalobos14 Jun 27, 2018
258163b
Nada
fvillalobos14 Jun 27, 2018
30a452f
Merge remote-tracking branch 'origin/Alexander' into test
lourdeszamora Jun 27, 2018
6de6c83
Final changes
fvillalobos14 Jun 27, 2018
d38c291
Merge pull request #1 from fvillalobos14/Lourdes
fvillalobos14 Jun 27, 2018
007fd78
Merge remote-tracking branch 'origin/Francis' into test
lourdeszamora Jun 27, 2018
337b661
Update seeds.rb
fvillalobos14 Jul 18, 2018
83ef27c
Seed.rb fixed
fvillalobos14 Jul 18, 2018
cd3c456
Merge with Lou
fvillalobos14 Jul 18, 2018
3744211
Fixed seeds.rb (again)
fvillalobos14 Jul 18, 2018
6e1cdde
Cerfitications now has permission on the filechecklist
EstherClaudino1 Jul 30, 2018
f501be9
El numero de muestras es unicamente editable por el area de quality.
fvillalobos14 Jul 30, 2018
05d1b0e
Merge branch 'Francis' into TestMerge
EstherClaudino1 Aug 1, 2018
0af0a9a
elementos innecesarios eliminados
christian-edgardo-rodriguez Aug 6, 2018
4c26ce2
Filtro de comprado en el inventario
EstherClaudino1 Aug 7, 2018
31bcfe3
Merge branch 'Esther' of https://github.com/fvillalobos14/chocolatsha…
christian-edgardo-rodriguez Aug 8, 2018
5b90cfc
cambiado organizacion por proveedor (solo visual)
christian-edgardo-rodriguez Aug 8, 2018
84c2e55
Reports from inventoty
EstherClaudino1 Aug 9, 2018
8ea9a5b
Added changes for checking sum of beans
fvillalobos14 Aug 9, 2018
594cc6c
Merge branch 'master' of https://github.com/fvillalobos14/chocolatsha…
lourdeszamora Aug 9, 2018
29f9863
Update batches code
lourdeszamora Aug 9, 2018
114bc5d
Merge pull request #2 from fvillalobos14/master
lourdeszamora Aug 9, 2018
60e262e
Minor changes to pdf report and hot fixes
EstherClaudino1 Aug 9, 2018
2c71fc2
Fixed merge issues
EstherClaudino1 Aug 9, 2018
62676ee
Hot fix on physical analysis
EstherClaudino1 Aug 9, 2018
f3d0a7b
Merge branch 'Lourdes' into TestMerge
EstherClaudino1 Aug 9, 2018
9acf9be
Merge branch 'Francis' into TestMerge
EstherClaudino1 Aug 9, 2018
78af8ae
hot fix
EstherClaudino1 Aug 15, 2018
c3e562e
numero de catadores agregado
christian-edgardo-rodriguez Aug 20, 2018
3212e93
Merge branch 'Lourdes' into Francis
fvillalobos14 Aug 20, 2018
f58114a
ft fitro
EstherClaudino1 Aug 20, 2018
ca642ba
ft filter completed
EstherClaudino1 Aug 20, 2018
420d5b0
Merge branch 'Christian' into Francis
fvillalobos14 Aug 20, 2018
17713f1
hot fix
EstherClaudino1 Aug 20, 2018
3e610b0
Merge branch 'Esther' into Francis
fvillalobos14 Aug 20, 2018
953ed4d
Merge branch 'Esther' of https://github.com/fvillalobos14/chocolatsha…
christian-edgardo-rodriguez Aug 21, 2018
5c119cd
working on totals
EstherClaudino1 Aug 21, 2018
870541e
quick fixes
EstherClaudino1 Aug 21, 2018
53c63e3
totals on inventories
EstherClaudino1 Aug 21, 2018
dc1c4ac
Verify bean count button disabling done
fvillalobos14 Aug 21, 2018
7d5c21f
Merge branch 'EstherCopy' into TestMerge
EstherClaudino1 Aug 21, 2018
641d48a
Merge branch 'Francis' of https://github.com/fvillalobos14/chocolatsh…
christian-edgardo-rodriguez Aug 22, 2018
caab6e0
hidden_field para campo observacion agregado
christian-edgardo-rodriguez Aug 22, 2018
482faf6
You win or you die
fvillalobos14 Aug 22, 2018
6b18f12
Merge branch 'Esther' into Francis
fvillalobos14 Aug 22, 2018
3b521f6
ya no se puede escribir en campo de observacion
christian-edgardo-rodriguez Aug 23, 2018
bcca56a
Merge branch 'Christian' into Francis
fvillalobos14 Aug 23, 2018
c47e9d4
No longer able to see observation field on sensory analysis and physi…
fvillalobos14 Aug 23, 2018
f259e0d
Option to view analyses results now available
fvillalobos14 Aug 23, 2018
12beefe
Observation can be entered after the result
EstherClaudino1 Aug 23, 2018
8bf684b
Quick fix
EstherClaudino1 Aug 23, 2018
f6ab054
Generate Analysis number
lourdeszamora Aug 23, 2018
c4fc94a
Merge branch 'Lourdes' into TestMerge
EstherClaudino1 Aug 23, 2018
7f2c090
Quick design fix
EstherClaudino1 Aug 23, 2018
31a5243
Sprint done
EstherClaudino1 Aug 23, 2018
b141378
Merge pull request #4 from fvillalobos14/Esther
EstherClaudino1 Aug 24, 2018
37c5ce7
Added bean field to batches model
fvillalobos14 Aug 25, 2018
4ffc649
Can now check for variable amount of beans
fvillalobos14 Aug 25, 2018
299d7e3
Documents views fixed on administration
EstherClaudino1 Aug 28, 2018
ac6df91
Finished bean count task
fvillalobos14 Aug 28, 2018
368261e
Variety available on results from analysis
EstherClaudino1 Aug 28, 2018
24bc0fc
Quality sheet number not editable on form
EstherClaudino1 Aug 28, 2018
6fe7b81
Changed sack amount for entry sheet number
fvillalobos14 Aug 29, 2018
e48d401
Fixed(?) bug within view
fvillalobos14 Aug 31, 2018
aebdf5e
average weight shown automatically
christian-edgardo-rodriguez Sep 5, 2018
7a5c8da
fixed formula
christian-edgardo-rodriguez Sep 5, 2018
c5951a5
PDF fix
EstherClaudino1 Sep 5, 2018
7021ab4
pdf fix
EstherClaudino1 Sep 5, 2018
510994a
Merge pull request #5 from fvillalobos14/Esther
EstherClaudino1 Sep 6, 2018
ddb4e2f
Merge pull request #6 from fvillalobos14/Esther
EstherClaudino1 Sep 6, 2018
0e9424c
Merge branch 'Francis' into TestMerge
EstherClaudino1 Sep 6, 2018
8f42c5a
Merge branch 'Christian' into TestMerge
EstherClaudino1 Sep 6, 2018
5c658f0
quick fix
EstherClaudino1 Sep 6, 2018
e8220a4
Merge pull request #7 from fvillalobos14/Esther
EstherClaudino1 Sep 6, 2018
c96dc90
Sprint done
EstherClaudino1 Sep 6, 2018
9a9f182
Merge pull request #8 from fvillalobos14/Esther
EstherClaudino1 Sep 6, 2018
a16ad3d
Changed db:seed to add organizations
EstherClaudino1 Sep 11, 2018
e90c234
Changed db:seed hot fix
EstherClaudino1 Sep 11, 2018
0757f7b
Merge pull request #10 from unitec-repositorios/Esther
EstherClaudino1 Sep 11, 2018
2bfc192
physical analysis will always be first
christian-edgardo-rodriguez Sep 11, 2018
b669f53
results shown after both analyses are done
christian-edgardo-rodriguez Sep 12, 2018
cdb2b17
Merge pull request #11 from unitec-repositorios/development
EstherClaudino1 Sep 13, 2018
0d777f8
even if rejected, batch stays in certification
christian-edgardo-rodriguez Sep 13, 2018
60fc5e0
Fixed inventory failure
fvillalobos14 Sep 13, 2018
2ce5be5
Merge pull request #12 from unitec-repositorios/Esther
EstherClaudino1 Sep 14, 2018
2d225dd
observation editable on qm
EstherClaudino1 Sep 14, 2018
cc46fee
Barcode now made from image
fvillalobos14 Sep 19, 2018
9e6c653
once rejected, batch can't be interacted with
christian-edgardo-rodriguez Sep 20, 2018
3a6d6c6
Fixed error in moveBatches view
fvillalobos14 Sep 20, 2018
1393a34
Entry date now is entered
EstherClaudino1 Sep 20, 2018
c38cd3a
fixed bug with certification
christian-edgardo-rodriguez Sep 20, 2018
a3fc1a8
rechzo purchase
lourdeszamora Sep 20, 2018
442be91
quick fixes
EstherClaudino1 Sep 20, 2018
3d7d700
Merge branch 'Francis' into TestMerge
EstherClaudino1 Sep 20, 2018
d3c867b
fix
EstherClaudino1 Sep 20, 2018
64a71c4
Merge branch 'Lourdes' into TestMerge
EstherClaudino1 Sep 20, 2018
9c5b73b
final checks done
christian-edgardo-rodriguez Sep 20, 2018
2cbbf99
Merge branch 'Christian' into TestMerge
EstherClaudino1 Sep 20, 2018
883d5fe
Merge pull request #13 from unitec-repositorios/Esther
EstherClaudino1 Sep 20, 2018
7a9d2fa
cosas necesarias para el servidor de pruebas
unitec-repositorios Oct 28, 2018
ad95d30
cambios necesarios que ocupo para el servidor
unitec-repositorios Oct 28, 2018
575bf49
Numero de hoja se incrementa con cada analisis y se resetea a 1 cada dia
Oct 30, 2018
2b8b2ea
Merge branch 'inti-contadordiario' into development
damasofc Nov 2, 2018
cfbe7f3
Development 1st Sprint ready
damasofc Nov 2, 2018
b4e64d8
Merge pull request #14 from unitec-repositorios/inti-contadordiario
unitec-repositorios Nov 2, 2018
5d5c977
Merge branch 'master' into development
damasofc Nov 2, 2018
d698fed
Merge branch 'development'
damasofc Nov 2, 2018
5293e2d
Revert "Merge branch 'development'"
damasofc Nov 2, 2018
fed2f25
Revert "Merge branch 'development'"
damasofc Nov 2, 2018
0387c3c
Ruta /sequence y codigo de barras generados en png con barby
Nov 3, 2018
37383c5
Numero de hoja con formato AAAAMMDDCC, con padding de 0s si el numero…
Nov 6, 2018
41913f8
Merge pull request #17 from unitec-repositorios/inti
damasofc Nov 6, 2018
369b5ec
GemFile agregando barby en general
damasofc Nov 7, 2018
9143fca
agregar chunky_png en general en el gemfile
damasofc Nov 8, 2018
5743d45
added state column in batches(lotes)
ivandres73 Nov 6, 2018
de999f3
por defecto todos los lotes entran como 'rec. ingresado'
ivandres73 Nov 11, 2018
9a75ac2
cambia el tipo de cacao y tambien el codigo
damasofc Nov 12, 2018
c324cd3
Analisis fisico antes que el sensorial. Analisis sensorial solo apare…
Nov 12, 2018
65788d7
cambio de calidad listo
damasofc Nov 13, 2018
39c6280
Ahora se puede Ver Analisis aun si no se hizo analisis sensorial. Tab…
Nov 13, 2018
1cda3ac
Modificado para que pueda pasar a una calidad superior
damasofc Nov 13, 2018
376c544
Barcode enviado como header de manera dinamica
Nov 14, 2018
3450ecb
states column changes...
ivandres73 Nov 14, 2018
442fd2c
cambio en el codigo despues de los analisis listos
damasofc Nov 14, 2018
12b36f5
Merge pull request #20 from unitec-repositorios/inti
ivandres73 Nov 14, 2018
1d342bd
Listo Calidad cambia luego de cada analisis
damasofc Nov 14, 2018
23e8520
Merge pull request #22 from unitec-repositorios/ivanC
damasofc Nov 14, 2018
901f1ee
solucionando pequeno detalle que daba nulo
damasofc Nov 14, 2018
dd64cce
Merge pull request #23 from unitec-repositorios/damasofc
ivandres73 Nov 14, 2018
6fd8c74
cambio pequeno para que funcione todo junto
damasofc Nov 14, 2018
7b49a24
cambios en parametros de aceptacion de calidad
damasofc Nov 20, 2018
fb7a0b1
funcion de updateState() en el model de batch
ivandres73 Nov 27, 2018
968f40e
agregada funcion updateState en lugares claves
ivandres73 Nov 27, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Sprint done
EstherClaudino1 committed Aug 23, 2018
commit 31a524302fdadb1e298fb61c8f6bb90e039883f4
6 changes: 4 additions & 2 deletions app/views/inventories/index.html.erb
Original file line number Diff line number Diff line change
@@ -109,14 +109,16 @@
<%else%>
<% if params[:ft] == "false" %>
No
<%else%>
<%elsif params[:ft] == "true" %>
Si
<%else %>

<%end%>
<%end%>
</p>

<p>Comprado:
<% if params[:purchase].to_s != "on" %>
<% if params[:purchase].to_s != "on" %>
No
<%else%>
Si