Skip to content
This repository has been archived by the owner on Feb 28, 2018. It is now read-only.

Refactor Input #138

Merged
merged 13 commits into from
Jan 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions elm-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"cuducos/elm-format-number": "2.0.0 <= v < 3.0.0",
"elm-community/elm-test": "3.1.0 <= v < 4.0.0",
"elm-community/json-extra": "2.1.0 <= v < 3.0.0",
"elm-community/list-extra": "5.0.1 <= v < 6.0.0",
"elm-lang/core": "5.0.0 <= v < 6.0.0",
"elm-lang/html": "2.0.0 <= v < 3.0.0",
"elm-lang/http": "1.0.0 <= v < 2.0.0",
Expand Down
10 changes: 8 additions & 2 deletions jarbas/frontend/elm/Internationalization.elm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Internationalization exposing (Language(..), TranslationId(..), translate)
module Internationalization exposing (Language(..), TranslationId(..), TranslationSet, translate)


type alias TranslationSet =
Expand Down Expand Up @@ -54,8 +54,8 @@ type TranslationId
| FieldIssueDateStart
| FieldIssueDateEnd
| FieldIssueDateValidation
| FieldMonth
| FieldClaimDate
| FieldMonth
| FieldRemarkValue
| FieldInstallment
| FieldBatchNumber
Expand All @@ -64,6 +64,7 @@ type TranslationId
| FieldLegOfTheTrip
| FieldProbability
| FieldSuspicions
| FieldEmpty
| ReimbursementSource
| ReimbursementChamberOfDeputies
| ReceiptFetch
Expand Down Expand Up @@ -375,6 +376,11 @@ translate lang trans =
"Suspicions"
"Suspeitas"

FieldEmpty ->
TranslationSet
""
""

ReimbursementSource ->
TranslationSet
"Source: "
Expand Down
12 changes: 6 additions & 6 deletions jarbas/frontend/elm/Model.elm
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ type alias Model =

model : Model
model =
Model
Reimbursement.model
Layout.model
Nothing
English
Material.model
{ reimbursements = Reimbursement.model
, layout = Layout.model
, googleStreetViewApiKey = Nothing
, lang = English
, mdl = Material.model
}
8 changes: 1 addition & 7 deletions jarbas/frontend/elm/Reimbursement/Decoder.elm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import Json.Decode exposing (Decoder, array, bool, float, int, keyValuePairs, li
import Json.Decode.Extra exposing (date)
import Json.Decode.Pipeline exposing (decode, hardcoded, required)
import Reimbursement.Company.Model as CompanyModel
import Reimbursement.Inputs.Model as InputsModel
import Reimbursement.Inputs.Update as InputsUpdate
import Reimbursement.Model exposing (Model, Reimbursement, Results, results)
import Reimbursement.Receipt.Decoder as ReceiptDecoder
import Reimbursement.Receipt.Model as ReceiptModel
Expand Down Expand Up @@ -138,12 +136,8 @@ updateLanguage lang model =
newResults : Results
newResults =
{ results | reimbursements = newReimbursements }

newInputs : InputsModel.Model
newInputs =
InputsUpdate.updateLanguage lang model.inputs
in
{ model | lang = lang, inputs = newInputs, results = newResults }
{ model | lang = lang, results = newResults }


updateGoogleStreetViewApiKey : Maybe String -> Model -> Model
Expand Down
Loading