Commit c81c8c40 authored by Mart Lubbers's avatar Mart Lubbers

Make incidone compile again and add to ci-tests

parent 46066864
Pipeline #12083 failed with stage
in 2 minutes and 2 seconds
test:
before_script:
- install_clean.sh bundle-complete && apt-get update -qq && apt-get install -y -qq build-essential
- install_clean.sh bundle-complete && apt-get update -qq && apt-get install -y -qq build-essential libsqlite3-dev libmariadbclient-dev-compat
image: "camilstaps/clean:nightly"
script:
- bash Tests/ci-tests.bash
......@@ -120,7 +120,7 @@ manageIncidentWeather incidentNo
where
weather = sdsFocus incidentNo incidentWeather
log = logIncidentWeatherUpdated incidentNo
viewWebWeather widgets = viewInformation (Title "Web weather info") [] (RawText widgets)
viewWebWeather widgets = viewInformation (Title "Web weather info") [] (Html widgets)
manageIncidentLog :: IncidentNo -> Task ()
manageIncidentLog incidentNo
......
......@@ -57,7 +57,7 @@ doAuthenticated task
= ( enterCredentials
>>* [OnAction (Action "Login")
(hasValue (\cred -> verifyCredentials cred >>- executeTask task))
] ) <<@ ApplyLayout (beforeStep (sequenceLayouts (setUIAttributes (titleAttr "Login")) frameCompact)) //Compact layout before login, full screen afterwards
] ) <<@ ApplyLayout (beforeStep (sequenceLayouts [setUIAttributes (titleAttr "Login"), frameCompact])) //Compact layout before login, full screen afterwards
where
enterCredentials :: Task Credentials
enterCredentials
......@@ -90,7 +90,7 @@ where
workOnTasks = doIndependent tasks <<@ ArrangeWithTabs True
layoutControlDash = foldl1 sequenceLayouts
layoutControlDash = sequenceLayouts
[moveSubUIs (SelectByPath [0,0]) [] 1
,moveSubUIs (SelectByPath [0,0]) [] 2
,removeSubUIs (SelectByPath [0])
......
......@@ -11,5 +11,5 @@ CLM="clm $CLMFLAGS $CLMLIBS"
( cd Examples/GIS; $CLM LeafletMapExample; )
( cd Examples/Graphics/BasicImagesExamples; for i in *.prj.default; do $CLM -I .. $(basename -s .prj.default $i); done; )
( cd Examples/Applications/TheTaxMan; $CLM TheTaxMan; )
#( cd Examples/Applications/Incidone; $CLM IncidoneCCC; )
( cd Examples/Applications/Incidone; $CLM -l -l sqlite3 -l -l mysqlclient IncidoneCCC; )
#( cd Examples/Applications/ShipAdventure; $CLM main; )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment