Code

Ivan c#130

Code

Open

ivandres73 wants to merge 159 commits intoRDRR7:masterRDRR7/chocolatshalba:masterfrom unitec-repositorios:ivanCunitec-repositorios/chocolatshalba:ivanCCopy head branch name to clipboard

+48,202-353

Commits

Commits on Jun 5, 2018

• agregado travis en el gemfile

  AlexBono97

  committed
  7f4a486

• Changes en el model y view de Batch

  EstherClaudino1

  committed
  42ab506

• Merge branch 'Alexander' of https://github.com/fvillalobos14/chocolatshalba into Esther

  EstherClaudino1

  committed
  d1f84c2

Commits on Jun 10, 2018

• Disenando el view V1

  AlexBono97

  committed
  992862d

Commits on Jun 11, 2018

• Avances

  AlexBono97

  committed
  2809ecb

• Merge remote-tracking branch 'origin/Esther' into TestMerge

  AlexBono97

  committed
  b5da8db

• Arreglar discrepancias por merge

  AlexBono97

  committed
  1c0be68

Commits on Jun 12, 2018

• parte visual finalizada

  AlexBono97

  committed
  460502d

• parte visual finalizadav2

  AlexBono97

  committed
  9789a94

Commits on Jun 14, 2018

• Checklist for files added

  EstherClaudino1

  committed
  ba81cb5

• changes on the checklist appeareance and model

  EstherClaudino1

  committed
  3278389

• Generacion de Codigo de

  Show description for ce3ee58
  lourdeszamora

  committed
  ce3ee58

• Merge branch 'Esther' of https://github.com/fvillalobos14/chocolatshalba into Lourdes

  lourdeszamora

  committed
  6fb0b13

• Codigo de barra agregado

  fvillalobos14

  committed
  740b9a8

• Codigo de barra ahora es visible en distintos usuarioS

  fvillalobos14

  committed
  dffdcbf

• Fixed issues with checklist not showing and issues with the code generation

  EstherClaudino1

  committed
  634382d

• Fixed more issues with code generation

  EstherClaudino1

  committed
  491f02a

Commits on Jun 24, 2018

• fixed some issues with reports

  EstherClaudino1

  committed
  1b4c7cd

Commits on Jun 27, 2018

• Inventory

  EstherClaudino1

  committed
  d354a62

• Fixed nil issues in Inventory

  EstherClaudino1

  committed
  29a5750

• Design fixes

  EstherClaudino1

  committed
  6330e9e

• Inventory ready

  EstherClaudino1

  committed
  1987ebd

• cambios en views

  AlexBono97

  committed
  5cb9371

• Mostrar lista de controles de ingreso

  lourdeszamora

  committed
  d481bae

• merge with Esther

  AlexBono97

  committed
  f047721

• agregado la columna de convertir de libras a kg

  AlexBono97

  committed
  4bfc433

• Graficas

  fvillalobos14

  committed
  e13816a

• Nada

  fvillalobos14

  committed
  258163b

• Merge remote-tracking branch 'origin/Alexander' into test

  Show description for 30a452f
  lourdeszamora

  committed
  30a452f

• Final changes

  fvillalobos14

  committed
  6de6c83

• Merge pull request #1 from fvillalobos14/Lourdes

  Show description for d38c291
  fvillalobos14

  authored
  d38c291

• Merge remote-tracking branch 'origin/Francis' into test

  lourdeszamora

  committed
  007fd78

Commits on Jul 18, 2018

• Update seeds.rb

  Show description for 337b661
  fvillalobos14

  authored
  337b661

• Seed.rb fixed

  fvillalobos14

  committed
  83ef27c

• Merge with Lou

  fvillalobos14

  committed
  cd3c456

• Fixed seeds.rb (again)

  fvillalobos14

  committed
  3744211

Commits on Jul 30, 2018

• Cerfitications now has permission on the filechecklist

  EstherClaudino1

  committed
  6e1cdde

• El numero de muestras es unicamente editable por el area de quality.

  fvillalobos14

  committed
  f501be9

Commits on Aug 1, 2018

• Merge branch 'Francis' into TestMerge

  EstherClaudino1

  committed
  05d1b0e

Commits on Aug 6, 2018

• elementos innecesarios eliminados

  christian-edgardo-rodriguez

  committed
  0af0a9a

Commits on Aug 7, 2018

• Filtro de comprado en el inventario

  EstherClaudino1

  committed
  4c26ce2

Commits on Aug 8, 2018

• Merge branch 'Esther' of https://github.com/fvillalobos14/chocolatshalba into Christian

  christian-edgardo-rodriguez

  committed
  31bcfe3

• cambiado organizacion por proveedor (solo visual)

  christian-edgardo-rodriguez

  committed
  5b90cfc

Commits on Aug 9, 2018

• Reports from inventoty

  EstherClaudino1

  committed
  84c2e55

• Added changes for checking sum of beans

  fvillalobos14

  committed
  8ea9a5b

• Merge branch 'master' of https://github.com/fvillalobos14/chocolatshalba into Lourdes

  lourdeszamora

  committed
  594cc6c

• Update batches code

  lourdeszamora

  committed
  29f9863

• Merge pull request #2 from fvillalobos14/master

  Show description for 114bc5d
  lourdeszamora

  authored
  114bc5d

• Minor changes to pdf report and hot fixes

  EstherClaudino1

  committed
  60e262e

• Fixed merge issues

  EstherClaudino1

  committed
  2c71fc2

• Hot fix on physical analysis

  EstherClaudino1

  committed
  62676ee

• Merge branch 'Lourdes' into TestMerge

  EstherClaudino1

  committed
  f3d0a7b

• Merge branch 'Francis' into TestMerge

  EstherClaudino1

  committed
  9acf9be

Commits on Aug 15, 2018

• hot fix

  EstherClaudino1

  committed
  78af8ae

Commits on Aug 20, 2018

• numero de catadores agregado

  christian-edgardo-rodriguez

  committed
  c3e562e

• Merge branch 'Lourdes' into Francis

  fvillalobos14

  committed
  3212e93

• ft fitro

  EstherClaudino1

  committed
  f58114a

• ft filter completed

  EstherClaudino1

  committed
  ca642ba

• Merge branch 'Christian' into Francis

  fvillalobos14

  committed
  420d5b0

• hot fix

  EstherClaudino1

  committed
  17713f1

• Merge branch 'Esther' into Francis

  fvillalobos14

  committed
  3e610b0

Commits on Aug 21, 2018

• Merge branch 'Esther' of https://github.com/fvillalobos14/chocolatshalba into Christian

  christian-edgardo-rodriguez

  committed
  953ed4d

• working on totals

  EstherClaudino1

  committed
  5c119cd

• quick fixes

  EstherClaudino1

  committed
  870541e

• totals on inventories

  EstherClaudino1

  committed
  53c63e3

• Verify bean count button disabling done

  fvillalobos14

  committed
  dc1c4ac

• Merge branch 'EstherCopy' into TestMerge

  EstherClaudino1

  committed
  7d5c21f

Commits on Aug 22, 2018

• Merge branch 'Francis' of https://github.com/fvillalobos14/chocolatshalba into Christian

  christian-edgardo-rodriguez

  committed
  641d48a

• hidden_field para campo observacion agregado

  christian-edgardo-rodriguez

  committed
  caab6e0

• You win or you die

  fvillalobos14

  committed
  482faf6

• Merge branch 'Esther' into Francis

  fvillalobos14

  committed
  6b18f12

Commits on Aug 23, 2018

• ya no se puede escribir en campo de observacion

  christian-edgardo-rodriguez

  committed
  3b521f6

• Merge branch 'Christian' into Francis

  fvillalobos14

  committed
  bcca56a

• No longer able to see observation field on sensory analysis and physical analysis. Added condition for entering sampler number.

  fvillalobos14

  committed
  c47e9d4

• Option to view analyses results now available

  fvillalobos14

  committed
  f259e0d

• Observation can be entered after the result

  EstherClaudino1

  committed
  12beefe

• Quick fix

  EstherClaudino1

  committed
  8bf684b

• Generate Analysis number

  lourdeszamora

  committed
  f6ab054

• Merge branch 'Lourdes' into TestMerge

  EstherClaudino1

  committed
  c4fc94a

• Quick design fix

  EstherClaudino1

  committed
  7f2c090

• Sprint done

  EstherClaudino1

  committed
  31a5243

Commits on Aug 24, 2018

• Merge pull request #4 from fvillalobos14/Esther

  Show description for b141378
  EstherClaudino1

  authored
  b141378

Commits on Aug 25, 2018

• Added bean field to batches model

  fvillalobos14

  committed
  37c5ce7

• Can now check for variable amount of beans

  fvillalobos14

  committed
  4ffc649

Commits on Aug 28, 2018

• Documents views fixed on administration

  EstherClaudino1

  committed
  299d7e3

• Finished bean count task

  fvillalobos14

  committed
  ac6df91

• Variety available on results from analysis

  EstherClaudino1

  committed
  368261e

• Quality sheet number not editable on form

  EstherClaudino1

  committed
  24bc0fc

Commits on Aug 29, 2018

• Changed sack amount for entry sheet number

  fvillalobos14

  committed
  6fe7b81

Commits on Aug 31, 2018

• Fixed(?) bug within view

  fvillalobos14

  committed
  e48d401

Commits on Sep 5, 2018

• average weight shown automatically

  christian-edgardo-rodriguez

  committed
  aebdf5e

• fixed formula

  christian-edgardo-rodriguez

  committed
  7a5c8da

• PDF fix

  EstherClaudino1

  committed
  c5951a5

• pdf fix

  EstherClaudino1

  committed
  7021ab4

Commits on Sep 6, 2018

• Merge pull request #5 from fvillalobos14/Esther

  Show description for 510994a
  EstherClaudino1

  authored
  510994a

• Merge pull request #6 from fvillalobos14/Esther

  Show description for ddb4e2f
  EstherClaudino1

  authored
  ddb4e2f

• Merge branch 'Francis' into TestMerge

  EstherClaudino1

  committed
  0e9424c

• Merge branch 'Christian' into TestMerge

  EstherClaudino1

  committed
  8f42c5a

• quick fix

  EstherClaudino1

  committed
  5c658f0

• Merge pull request #7 from fvillalobos14/Esther

  Show description for e8220a4
  EstherClaudino1

  authored
  e8220a4

• Sprint done

  EstherClaudino1

  committed
  c96dc90

• Merge pull request #8 from fvillalobos14/Esther

  Show description for 9a9f182
  EstherClaudino1

  authored
  9a9f182

Commits on Sep 11, 2018

• Changed db:seed to add organizations

  EstherClaudino1

  committed
  a16ad3d

• Changed db:seed hot fix

  EstherClaudino1

  committed
  e90c234

• Merge pull request #10 from unitec-repositorios/Esther

  Show description for 0757f7b
  EstherClaudino1

  authored
  0757f7b

• physical analysis will always be first

  christian-edgardo-rodriguez

  committed
  2bfc192

Commits on Sep 12, 2018

• results shown after both analyses are done

  christian-edgardo-rodriguez

  committed
  b669f53

Commits on Sep 13, 2018

• Merge pull request #11 from unitec-repositorios/development

  Show description for cdb2b17
  EstherClaudino1

  authored
  cdb2b17

• even if rejected, batch stays in certification

  christian-edgardo-rodriguez

  committed
  0d777f8

• Fixed inventory failure

  fvillalobos14

  committed
  60fc5e0

Commits on Sep 14, 2018

• Merge pull request #12 from unitec-repositorios/Esther

  Show description for 2ce5be5
  EstherClaudino1

  authored
  2ce5be5

• observation editable on qm

  EstherClaudino1

  committed
  2d225dd

Commits on Sep 19, 2018

• Barcode now made from image

  fvillalobos14

  committed
  cc46fee

Commits on Sep 20, 2018

• once rejected, batch can't be interacted with

  christian-edgardo-rodriguez

  committed
  9e6c653

• Fixed error in moveBatches view

  fvillalobos14

  committed
  3a6d6c6

• Entry date now is entered

  EstherClaudino1

  committed
  1393a34

• fixed bug with certification

  christian-edgardo-rodriguez

  committed
  c38cd3a

• rechzo purchase

  lourdeszamora

  committed
  a3fc1a8

• quick fixes

  EstherClaudino1

  committed
  442be91

• Merge branch 'Francis' into TestMerge

  EstherClaudino1

  committed
  3d7d700

• fix

  EstherClaudino1

  committed
  d3c867b

• Merge branch 'Lourdes' into TestMerge

  EstherClaudino1

  committed
  64a71c4

• final checks done

  christian-edgardo-rodriguez

  committed
  9c5b73b

• Merge branch 'Christian' into TestMerge

  EstherClaudino1

  committed
  2cbbf99

• Merge pull request #13 from unitec-repositorios/Esther

  Show description for 883d5fe
  EstherClaudino1

  authored
  883d5fe

Commits on Oct 28, 2018

• cosas necesarias para el servidor de pruebas

  unitec-repositorios

  committed
  7a9d2fa

• cambios necesarios que ocupo para el servidor

  unitec-repositorios

  committed
  ad95d30

Commits on Oct 30, 2018

• Numero de hoja se incrementa con cada analisis y se resetea a 1 cada dia

  

  intiv

  committed
  575bf49

Commits on Nov 2, 2018

• Merge branch 'inti-contadordiario' into development

  damasofc

  committed
  2b8b2ea

• Development 1st Sprint ready

  damasofc

  committed
  cfbe7f3

• Merge pull request #14 from unitec-repositorios/inti-contadordiario

  Show description for b4e64d8
  unitec-repositorios

  authored
  b4e64d8

• Merge branch 'master' into development

  damasofc

  committed
  5d5c977

• Merge branch 'development'

  damasofc

  committed
  d698fed

• Revert "Merge branch 'development'"

  Show description for 5293e2d
  damasofc

  committed
  5293e2d

• Revert "Merge branch 'development'"

  Show description for fed2f25
  damasofc

  committed
  fed2f25

Commits on Nov 3, 2018

• Ruta /sequence y codigo de barras generados en png con barby

  

  intiv

  committed
  0387c3c

Commits on Nov 6, 2018

• Numero de hoja con formato AAAAMMDDCC, con padding de 0s si el numero es menor a 10. Arreglado bug de nil si no se encontraba el sequence al guardar analisis fisico

  

  intiv

  committed
  37383c5

• Merge pull request #17 from unitec-repositorios/inti

  Show description for 41913f8
  damasofc

  authored
  41913f8

Commits on Nov 7, 2018

• GemFile agregando barby en general

  damasofc

  committed
  369b5ec

Commits on Nov 8, 2018

• agregar chunky_png en general en el gemfile

  damasofc

  committed
  9143fca

Commits on Nov 10, 2018

• added state column in batches(lotes)

  ivandres73

  committed
  5743d45

Commits on Nov 11, 2018

• por defecto todos los lotes entran como 'rec. ingresado'

  ivandres73

  committed
  de999f3

Commits on Nov 12, 2018

• cambia el tipo de cacao y tambien el codigo

  Show description for 9a75ac2
  damasofc

  committed
  9a75ac2

• Analisis fisico antes que el sensorial. Analisis sensorial solo aparece si el resultado del analisis fisico fue A, en cual caso solo aparece Mostrar codigo de barra por ahora (La tabla se mira fea,…

  Show description for c324cd3
  

  intiv

  committed
  c324cd3

Commits on Nov 13, 2018

• cambio de calidad listo

  Show description for 65788d7
  damasofc

  committed
  65788d7

• Ahora se puede Ver Analisis aun si no se hizo analisis sensorial. Tabla ahora deberia salir bien siempre

  

  intiv

  committed
  39c6280

• Modificado para que pueda pasar a una calidad superior

  Show description for 1cda3ac
  damasofc

  committed
  1cda3ac

Commits on Nov 14, 2018

• Barcode enviado como header de manera dinamica

  

  intiv

  committed
  376c544

• states column changes...

  ivandres73

  committed
  3450ecb

• cambio en el codigo despues de los analisis listos

  damasofc

  committed
  442fd2c

• Merge pull request #20 from unitec-repositorios/inti

  Show description for 12b36f5
  ivandres73

  authored
  12b36f5

• Listo Calidad cambia luego de cada analisis

  Show description for 1d342bd
  damasofc

  committed
  1d342bd

• Merge pull request #22 from unitec-repositorios/ivanC

  Show description for 23e8520
  damasofc

  authored
  23e8520

• solucionando pequeno detalle que daba nulo

  damasofc

  committed
  901f1ee

• Merge pull request #23 from unitec-repositorios/damasofc

  Show description for dd64cce
  ivandres73

  authored
  dd64cce

• cambio pequeno para que funcione todo junto

  Show description for 6fd8c74
  damasofc

  committed
  6fd8c74

Commits on Nov 20, 2018

• cambios en parametros de aceptacion de calidad

  Show description for 7b49a24
  damasofc

  committed
  7b49a24

Commits on Nov 27, 2018

• funcion de updateState() en el model de batch

  ivandres73

  committed
  fb7a0b1

• agregada funcion updateState en lugares claves

  ivandres73

  committed
  968f40e