changeset 771:fa5ccb4dd0c8

marged
author ISHIKAWA MAI <c113017@e.koeki-u.ac.jp>
date Fri, 10 Jul 2015 12:33:43 +0900
parents 84f6f59c1608 (current diff) 13fc063e9c33 (diff)
children e6952911e6dd
files oasis2015/img/kamon1.png oasis2015/img/kamon2.png oasis2015/img/shishippu1.png oasis2015/img/shishippu2.png oasis2015/img/shishippu3.png oasis2015/img/shishippu4.png oasis2015/img/shishippu5.png oasis2015/img/sisip.png
diffstat 15 files changed, 129 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/oasis2015/accountcheck.rb	Fri Jul 10 12:33:22 2015 +0900
+++ b/oasis2015/accountcheck.rb	Fri Jul 10 12:33:43 2015 +0900
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby22
 # -*- coding: utf-8 -*-
 
 require 'sqlite3'
@@ -7,11 +7,44 @@
 
 c = CGI.new(:tag_maker => "html5", :accept_charest => "UTF-8")
 db = SQLite3::Database.new("sql/main.sq3")
-sql = "insert into test values (?, ?, ?, ?, ?, ?, ?, ?, ?)"
+
+
+sql = "insert into test values(?, ?, ?, ?, ?, ?, ?, ?, ?)"
+#sql = "insert into test values (?, 0, 0, 0, 0, 0, 0, 0, 0)"
+#squp = "update test set name = ?, cal = ?, age = ?, sex = ? , aria = ? , exp = ? , pt = ?, lv = ?  where id = ?"
+
+
 toi = "insert into toi values (?, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)"
 item = "insert into goods values (?, 0, 0, 0, 0, 0, 0)"
 
 name = c["name"]
+
+cle1 = "CREATE TABLE IF NOT EXISTS test(id, name, cal, age, sex, aria, exp, pt, lv)"
+cle2 = "CREATE TABLE IF NOT EXISTS toi(id, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10)"
+cle3 = "CREATE TABLE IF NOT EXISTS goods(id, g1, g2, g3, g4, g5, g6)"
+cle4 = "CREATE TABLE IF NOT EXISTS time(cd, now, id)"
+
+ins4 = 'insert into time values(?, 61, "n")'
+
+db.execute(cle1)
+db.execute(cle2)
+db.execute(cle3)
+db.execute(cle4)
+if name == "createman789789789"
+db.execute(ins4, "a")
+db.execute(ins4, "b")
+db.execute(ins4, "c")
+db.execute(ins4, "d")
+db.execute(ins4, "e")
+db.execute(ins4, "f")
+db.execute(ins4, "g")
+db.execute(ins4, "h")
+db.execute(ins4, "i")
+db.execute(ins4, "j")
+end
+
+name = c["name"]
+namae = "#{name}"
 cal = c["cal"]
 age = c["age"]
 sex = c["sex"]
@@ -25,6 +58,9 @@
   pt = 0
   lv = 1
   db.execute(sql, id, name, cal, age, sex, aria, exp, pt, lv)
+#  db.execute(sql, id)
+#  db.execute(squp, namae, cal, age, sex, aria, exp, pt, lv, id)
+
   db.execute(toi, id)
   db.execute(item, id)
 end
@@ -32,7 +68,6 @@
   id2 = rand(1000000)
 
 
-
 expires = "SAT, 24 Oct 2015 00:00:00 GMT"
 
 printf("Content-type: text/html; charset=UTF-8
@@ -51,14 +86,15 @@
 <h2>登録が完了しました!</h2>
 <p>ようこそ_ %s _さん!</p>
 <p>あなたのIDは%04dです。抽選はこのIDを元に行われます。</p>
-<a href="prof.rb"><div class="lets"><span>始めよう!</span></div></a>
+<div class="f1"><a href="prof.rb"><div class="lets"><span>始めよう!</span></div></a></div>
 <form method="POST" type="text">
 </form>
 </body></html>
 _EOS_
 
 
-if name == "deleteman123123123"
-`cp sql/tsback.sq3 sql/main.sq3`
-`chmod a+w sql/main.sq3`
+if name == "createman987987987"
+  `rm sql/main.sq3`
+#  `touch sql/main.sq3`
+#  `chmod a+w sql/main.sq3`
 end
--- a/oasis2015/gets.rb	Fri Jul 10 12:33:22 2015 +0900
+++ b/oasis2015/gets.rb	Fri Jul 10 12:33:43 2015 +0900
@@ -136,7 +136,7 @@
 まぐろ</td><td>:%d</td></tr>
 </table>
 <br><br>
-<a href="prof.rb">もどる!</a>
+<div class="f1"><a href="prof.rb"><div class="lets"><span>もどる!</span></div></a></div>
 <br><br>
 <form method="POST" action="gets.rb">
 <input type="text" name="trade" value="ここは スタッフ の 人 が つかうよ!">
--- a/oasis2015/gohan.rb	Fri Jul 10 12:33:22 2015 +0900
+++ b/oasis2015/gohan.rb	Fri Jul 10 12:33:43 2015 +0900
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby 22
 # -*- coding: utf-8 -*-
 require 'cgi'
 require 'sqlite3'
@@ -101,7 +101,7 @@
 
 
 
-modoru = '<br><a href="prof.rb"><div class="lets"><span>ホーム'
+modoru = '<br><div class="f1"><a href="prof.rb"><div class="lets"><span>ホーム'
 back = modoru
 if lv < 5 && gohan == "g1" || lv < 5 && gohan == "g2"
   mo = '<input type="button" value="おかわり!" onclick="location.reload();" />'
@@ -109,7 +109,7 @@
 elsif lv >= 5
   back += "<br>(レベルマックスだよ!)"
 end
-back += '</span></div></a>'
+back += '</span></div></a></div>'
 
 cook = db.execute(data, person)
 exp = cook[0][6]
Binary file oasis2015/img/kamon1.png has changed
Binary file oasis2015/img/kamon2.png has changed
Binary file oasis2015/img/shishippu1.png has changed
Binary file oasis2015/img/shishippu2.png has changed
Binary file oasis2015/img/shishippu3.png has changed
Binary file oasis2015/img/shishippu4.png has changed
Binary file oasis2015/img/shishippu5.png has changed
Binary file oasis2015/img/sisip.png has changed
--- a/oasis2015/index.html	Fri Jul 10 12:33:22 2015 +0900
+++ b/oasis2015/index.html	Fri Jul 10 12:33:43 2015 +0900
@@ -37,7 +37,7 @@
            <option value="boy">男の子
            <option value="girl">女の子
         </select></td></tr>
-<tr><td></td><td><input type="submit" value="送信"></td></tr>
+<tr><td></td><td><input type="submit" value="登録する!"></td></tr>
 </table>
 <img src="account.png" width="幅" height="画像の高さ" alt="">
 </form>
--- a/oasis2015/prof.rb	Fri Jul 10 12:33:22 2015 +0900
+++ b/oasis2015/prof.rb	Fri Jul 10 12:33:43 2015 +0900
@@ -1,15 +1,19 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby22
 # -*- coding: utf-8 -*-
 require 'cgi'
 require 'sqlite3'
 require 'kconv'
 c = CGI.new(:tag_maker => "html5", :accept_charest => "UTF-8")
-db = SQLite3::Database.new("sql/main.sq3")
+db = SQLite3::Database.new("./sql/main.sq3")
 
 id = c.cookies["id"][0]
 person = id.to_i
-data = "select * from test where id = ?" #idが?(後で代入)のデータをtest票から探す。という命令をdataにしくむ。全てがほしい場合は「*」。「*」を「name」に変えると該当データのnameだけとりだす。
+
+data = "select * from test where id = ?"
+data2 = "select * from test where id = ?"
+#idが?(後で代入)のデータをtest票から探す。という命令をdataにしくむ。全てがほしい場合は「*」。「*」を「name」に変えると該当データのnameだけとりだす。
 cook = db.execute(data, person)               #dataに仕組んでいた命令を、personを代入しつつ実行。
+cook2 = db.execute(data2, person)
 jikan1 = "select * from time where cd = ?"
 timeupd = "update time set now = ?, id = ? where cd = ?"
 
@@ -18,6 +22,7 @@
 toi = db.execute(que, person)
 
 bomd = "update test set pt = ? where id = ?"
+ins4 = 'insert into time values(?, 61, "n")'
 
 name = cook[0][1]
 cal = cook[0][2]
@@ -28,7 +33,6 @@
 pt = cook[0][7]
 lv = cook[0][8]
 
-
 q1 = toi[0][1]
 q2 = toi[0][2]
 q3 = toi[0][3]
@@ -56,12 +60,29 @@
 #########前の人が書き込んだ時間と比べて60秒以内なら追加ポイント####
 kpt = 0
 bom = c["bom"]                        ####<form ~~ name="bom">より
+
+begin
+  jikan2 = db.execute(jikan1, "j")
+  now1 = jikan2[0][1]
+rescue
+  db.execute(ins4, "a")
+  db.execute(ins4, "b")
+  db.execute(ins4, "c")
+  db.execute(ins4, "d")
+  db.execute(ins4, "e")
+  db.execute(ins4, "f")
+  db.execute(ins4, "g")
+  db.execute(ins4, "h")
+  db.execute(ins4, "i")
+  db.execute(ins4, "j")
+end
+
 if bom == "skip"
-jikan2 = db.execute(jikan1, "j")
-now1 = jikan2[0][1]
-nowper = jikan2[0][2]
-now2 = Time.now.to_i
-db.execute(timeupd, now2, person, "j")
+  jikan2 = db.execute(jikan1, "j")
+  now1 = jikan2[0][1]
+  nowper = jikan2[0][2]
+  now2 = Time.now.to_i
+  db.execute(timeupd, now2, person, "j")
   if person == nowper
   elsif now1 == nil
   elsif now2-now1 < 2                 ####2秒以内なら~
@@ -70,49 +91,49 @@
   end
   pt += 1
   kpt += 1
-#  db.execute(bomd, pt, person)
+  #  db.execute(bomd, pt, person)
 end
 
 qrAC = qrc            ###生成したハッシュには、"乱数"=>"記号"が入っている
 getAC = ARGV[0].to_i  ###URL?以降の文字(特定の乱数)を取得
 qr = qrAC[getAC]      ###特定の"乱数"が一致すると、"乱数"=>"記号"がqrに正しく入力される。
 if qr =="a" && q1 == 0
-q1 += 1
-jikan2 = db.execute(jikan1, "a")
-now1 = jikan2[0][1]
-nowper = jikan2[0][2]
-now2 = Time.now.to_i
-db.execute(timeupd, now2, person, "a")
+  q1 += 1
+  jikan2 = db.execute(jikan1, "a")
+  now1 = jikan2[0][1]
+  nowper = jikan2[0][2]
+  now2 = Time.now.to_i
+  db.execute(timeupd, now2, person, "a")
   if person == nowper
   elsif now1 == nil
   elsif now2-now1 < 60
     pt += 2
     kpt += 2
   end
-pt += 10
-kpt += 10
+  pt += 10
+  kpt += 10
 elsif qr == "b" && q2 == 0
-q2 += 1
-jikan2 = db.execute(jikan1, "b")
-now1 = jikan2[0][1]
-nowper = jikan2[0][2]
-now2 = Time.now.to_i
-db.execute(timeupd, now2, person, "b")
+  q2 += 1
+  jikan2 = db.execute(jikan1, "b")
+  now1 = jikan2[0][1]
+  nowper = jikan2[0][2]
+  now2 = Time.now.to_i
+  db.execute(timeupd, now2, person, "b")
   if person == nowper
   elsif now1 == nil
   elsif now2-now1 < 60
     pt += 2
     kpt += 2
   end
-pt += 10
-kpt += 10
+  pt += 10
+  kpt += 10
 elsif qr == "c" && q3 == 0
-q3 += 1
-jikan2 = db.execute(jikan1, "c")
-now1 = jikan2[0][1]
-nowper = jikan2[0][2]
-now2 = Time.now.to_i
-db.execute(timeupd, now2, person, "c")
+  q3 += 1
+  jikan2 = db.execute(jikan1, "c")
+  now1 = jikan2[0][1]
+  nowper = jikan2[0][2]
+  now2 = Time.now.to_i
+  db.execute(timeupd, now2, person, "c")
   if person == nowper
   elsif now1 == nil
   elsif now2-now1 < 60
@@ -122,12 +143,12 @@
   pt += 10
   kpt += 10
 elsif qr == "d" && q4 == 0
-q4 += 1
-jikan2 = db.execute(jikan1, "d")
-now1 = jikan2[0][1]
-nowper = jikan2[0][2]
-now2 = Time.now.to_i
-db.execute(timeupd, now2, person, "d")
+  q4 += 1
+  jikan2 = db.execute(jikan1, "d")
+  now1 = jikan2[0][1]
+  nowper = jikan2[0][2]
+  now2 = Time.now.to_i
+  db.execute(timeupd, now2, person, "d")
   if person == nowper
   elsif now1 == nil
   elsif now2-now1 < 60
@@ -137,12 +158,12 @@
   pt += 10
   kpt += 10
 elsif qr == "e" && q5 == 0
-q5 += 1
-jikan2 = db.execute(jikan1, "e")
-now1 = jikan2[0][1]
-nowper = jikan2[0][2]
-now2 = Time.now.to_i
-db.execute(timeupd, now2, person, "e")
+  q5 += 1
+  jikan2 = db.execute(jikan1, "e")
+  now1 = jikan2[0][1]
+  nowper = jikan2[0][2]
+  now2 = Time.now.to_i
+  db.execute(timeupd, now2, person, "e")
   if person == nowper
   elsif now1 == nil
   elsif now2-now1 < 60
@@ -153,6 +174,7 @@
   kpt += 10
 end
 
+
 db.execute(bomd, pt, person)
 db.execute(queupd, q1, q2, q3, q4, q5, person)
 
@@ -213,13 +235,13 @@
 
 if lv == 1
 color = "black"
-elsif lv ==2
+elsif lv == 2
 color = "navy"
-elsif lv ==3
+elsif lv == 3
 color = "green"
-elsif lv ==4
+elsif lv == 4
 color = "red"
-elsif lv ==5
+elsif lv == 5
 color = "yellow"
 else
 color = "pink"
@@ -231,10 +253,10 @@
 gage = 0
 exp2 = exp
 if lv < 5
-while exp2 >= 10
-exp2 -= 10
-end
-gage = 100-exp2*10
+  while exp2 >= 10
+    exp2 -= 10
+  end
+  gage = 100-exp2*10
 end
 
 
@@ -244,7 +266,7 @@
 
 #以下のprintfについて
 #pre*4はstyleの部分、<h2>{margin(本来OS_,per,gage,per,per,per,name...)
-printf(<<_EOS_, per, gage, per, per, per, color, kkget, image, alt, name, person, cal, lv, pt, m1, mimg1, m2, mimg2)
+printf(<<_EOS_, per, gage, per, per, per, color, cook, kkget, image, alt, name, person, cal, lv, pt, m1, mimg1, m2, mimg2)
 
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
@@ -273,7 +295,7 @@
 </head>
 
 <body>
-<header><p></p></header>
+<header><p>%s</p></header>
 <h1>さかたっち</h1>
 <h2>%s</h2>
 
--- a/oasis2015/profeel.css	Fri Jul 10 12:33:22 2015 +0900
+++ b/oasis2015/profeel.css	Fri Jul 10 12:33:43 2015 +0900
@@ -35,18 +35,21 @@
 table.state{text-align:left;}
 table.state tr+tr+tr+tr{font-size:xx-large;}
 
+
+div.f1{padding:0% 0%;
+margin:1em 17em;}
 div.lets{
 border:solid 2px #fa0;
 background:#faf;
 padding:1% 0%;
-margin:1em 17em;
+#margin:1em 17em;
 }
 div.lets span{color:navy;  text-decoration: underline #faf;}
 
 div.cal {margin-left:auto; margin-right:auto;
 width: 320px; height: 180px;
 background: white}
-#div.cal div{float:left; border:solid black;}
+
 
 
 #form{margin-left:auto; margin-right:auto;}
Binary file oasis2015/sql/.nfsA1cdc4.4 has changed

yatex.org