[consultant profile includes contact info thomashartman1@gmail.com**20080928102055] hunk ./src/AppStateSetBased.hs 141 - billing_rate = "it depends on the project" + --billing_rate = "it depends on the project" + contact = "thomashartman1 at gmail, +48, whatever" hunk ./src/ControllerGetActions.hs 87 - Just cp -> do - let pr = paintConsultantProfile rglobs cp user - return . tutlayoutU rglobs [("profile",pr)] $ "viewconsultantprofile" + Just cp -> return . tutlayoutU rglobs [("cp",paintProfile rglobs user cp)] $ "viewconsultantprofile" hunk ./src/ControllerGetActions.hs 107 - let showPr = paintConsultantProfile rglobs cp (username currU) - + let --showPr = paintConsultantProfile rglobs cp (username currU) hunk ./src/ControllerGetActions.hs 109 + showPr = paintProfile rglobs (username currU) cp + -- use show below to properly escape quotes hunk ./src/ControllerGetActions.hs 113 - , ("billingRate",show . billing_rate $ cp) + , ("contact",show . contact $ cp) hunk ./src/ControllerPostActions.hs 51 -data ConsultantProfilePostData = ConsultantProfilePostData {formBillingrate :: String +data ConsultantProfilePostData = ConsultantProfilePostData {formContact :: String hunk ./src/ControllerPostActions.hs 59 - fromData = liftM4 ConsultantProfilePostData ( (look "billingrate") `mplus` (return "") ) + fromData = liftM4 ConsultantProfilePostData ( (look "contact") `mplus` (return "") ) hunk ./src/ControllerPostActions.hs 69 - withData $ \fd@(ConsultantProfilePostData pBill pBlurb listAsC submitbtn) -> [ ServerPartT $ \rq -> do + withData $ \fd@(ConsultantProfilePostData pContact pBlurb listAsC submitbtn) -> [ ServerPartT $ \rq -> do hunk ./src/ControllerPostActions.hs 74 - let {-newcp = case submitbtn of - -- read is compileholder, this ain't gonna work. hey, this would be a great place to - -- start using saferead, too. - "submit edit" -> Just $ ConsultantProfile pBill pBlurb (read $ traceMsg "listAsC: " listAsC) - otherwise -> Nothing -} - newcp = ConsultantProfile pBill pBlurb listAsC -- TK, bool placeholder, use readSafe. + let newcp = ConsultantProfile pContact pBlurb listAsC -- TK, bool placeholder, use readSafe. hunk ./src/SerializeableUsers.hs 17 - billing_rate :: String -- eg "" (blank is ok), "$30-$50/hour", "40-50 Euro/hour", "it depends on the project", etc. + --billing_rate :: String -- eg "" (blank is ok), "$30-$50/hour", "40-50 Euro/hour", "it depends on the project", etc. + contact :: String -- eg, "thomashartman1 at gmail, 917 915 9941" hunk ./src/View.hs 138 +{- hunk ./src/View.hs 147 - +-} +paintProfile :: RenderGlobals -> String -> ConsultantProfile -> String +paintProfile rglobs user cp = + let attrs = [("username",user) + , ("blurb",paintblurb . blurb $ cp) + --, ("jobsPosted",paintJobsTable n rglobs $ js) + , ("contact",contact cp)] + in renderTemplateGroup (templates rglobs) attrs "consultantprofile" hunk ./templates/editconsultantprofile.st 6 - $!Billing Rate:!$ + $!Contact:!$ hunk ./templates/viewconsultantprofile.st 1 -$ profile $ +$ cp $ hunk ./templates/viewconsultantprofileInclude.st 1 -$!

$ username $

!$ -

$username$

- -$ errormsgProfile$ - -$!

Profile

!$ -

About Me: $ blurb $

-$!

Billing Rate: $ billingRate $

!$ -$! -

Job Posts

- $ jobsPosted $ -!$ + rmfile ./templates/viewconsultantprofileInclude.st hunk ./todo 9 - check box for happs developer hunk ./todo 15 - announcement: "In Version 4 of the ongoing self-demoing HAppS Tutorial, we implement a HAppS job board using HAppS. + + announcement: "In Version 4 of the ongoing self-demoing HAppS Tutorial, we implement a HAppS job board using HAppS." +