diff --git a/docker-compose.yaml b/docker-compose.yaml index 72709c4..62416e2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,8 @@ services: pills: image: n0rdye/pills + container_name: nodejs_pills ports: - - 8080:8080 + - 70:8080 volumes: - ./:/usr/src/app diff --git a/index.js b/index.js index bf1d3cf..25bf066 100644 --- a/index.js +++ b/index.js @@ -84,8 +84,12 @@ function jwrite(jdata){ } }) } + + + function jwrite_pill(name,pill,date,comment){ - comment = (comment==""||comment==null&&comment==" ")? "-":comment; + comment = (comment==""||comment==null||comment==" "||comment==undefined||comment==" ")? "-":comment; + // console.log(comment,"||"); fs.readFile('./pills.json','utf8',(err,data)=>{ let jdata = JSON.parse(data); jdata[name] = { diff --git a/views/inputs.ejs b/views/inputs.ejs index ae69ed4..6c64319 100644 --- a/views/inputs.ejs +++ b/views/inputs.ejs @@ -32,13 +32,14 @@ let pills = ["4/2","4/1","4","2","2/1","1","0"]; let i=0; pills.forEach(el => { + let check = (el=="4")? "checked":""; %> -