From 895c52b6491139460191f29385f44d6a73d573da Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Mon, 21 Sep 2015 16:37:21 +1000 Subject: [PATCH] in game interface for creating server polls --- SQL/database_changelog.txt | 10 +++ SQL/tgstation_schema.sql | 3 + SQL/tgstation_schema_prefixed.sql | 3 + code/modules/admin/admin_verbs.dm | 3 +- code/modules/admin/create_poll.dm | 136 ++++++++++++++++++++++++++++++ html/changelogs/jordie poll.yml | 6 ++ tgstation.dme | 1 + 7 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 code/modules/admin/create_poll.dm create mode 100644 html/changelogs/jordie poll.yml diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt index a7308fea1b0..e142f20cfab 100644 --- a/SQL/database_changelog.txt +++ b/SQL/database_changelog.txt @@ -1,3 +1,13 @@ +21 September 2015, by Jordie0608 + +Modified table 'poll_question', adding columns 'createdby_ckey', 'createdby_ip' and 'for_trialmin' to bring it inline with the schema used by the tg servers. + +ALTER TABLE `feedback`.`poll_question` ADD COLUMN `createdby_ckey` VARCHAR(45) NULL DEFAULT NULL AFTER `multiplechoiceoptions`, ADD COLUMN `createdby_ip` VARCHAR(45) NULL DEFAULT NULL AFTER `createdby_ckey`, ADD COLUMN `for_trialmin` VARCHAR(45) NULL DEFAULT NULL AFTER `createdby_ip` + +Remember to add a prefix to the table name if you use them + +---------------------------------------------------- + 27 August 2015, by Jordie0608 Modified table 'watch', removing 'id' column, making 'ckey' primary and adding the columns 'timestamp', 'adminckey', 'last_editor' and 'edits'. diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql index 6b0518bda38..34d83537256 100644 --- a/SQL/tgstation_schema.sql +++ b/SQL/tgstation_schema.sql @@ -263,6 +263,9 @@ CREATE TABLE `poll_question` ( `question` varchar(255) NOT NULL, `adminonly` tinyint(1) DEFAULT '0', `multiplechoiceoptions` int(2) DEFAULT NULL, + `createdby_ckey` varchar(45) NULL DEFAULT NULL, + `createdby_ip` varchar(45) NULL DEFAULT NULL, + `for_trialmin` varchar(45) NULL DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql index a800b11013f..fe40d2f72cf 100644 --- a/SQL/tgstation_schema_prefixed.sql +++ b/SQL/tgstation_schema_prefixed.sql @@ -258,6 +258,9 @@ CREATE TABLE `SS13_poll_question` ( `question` varchar(255) NOT NULL, `adminonly` tinyint(1) DEFAULT '0', `multiplechoiceoptions` int(2) DEFAULT NULL, + `createdby_ckey` varchar(45) NULL DEFAULT NULL, + `createdby_ip` varchar(45) NULL DEFAULT NULL, + `for_trialmin` varchar(45) NULL DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 92ea19f1afc..5daf086fc54 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -138,7 +138,8 @@ var/list/admin_verbs_possess = list( /proc/release ) var/list/admin_verbs_permissions = list( - /client/proc/edit_admin_permissions + /client/proc/edit_admin_permissions, + /client/proc/create_poll ) var/list/admin_verbs_rejuv = list( /client/proc/respawn_character diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm new file mode 100644 index 00000000000..7034f908916 --- /dev/null +++ b/code/modules/admin/create_poll.dm @@ -0,0 +1,136 @@ +/client/proc/create_poll() + set name = "Create Poll" + set category = "Special Verbs" + if(!check_rights(R_PERMISSIONS)) return + if(!dbcon.IsConnected()) + src << "Failed to establish database connection." + return + var/polltype = input("Choose poll type.","Poll Type") in list("Single Option","Text Reply","Rating","Multiple Choice") + var/choice_amount = 0 + switch(polltype) + if("Single Option") + polltype = "OPTION" + if("Text Reply") + polltype = "TEXT" + if("Rating") + polltype = "NUMVAL" + if("Multiple Choice") + polltype = "MULTICHOICE" + choice_amount = input("How many choices should be allowed?","Select choice amount") as num + var/starttime = SQLtime() + var/endtime = input("Set end time for poll as format YYYY-MM-DD HH:MM:SS. All times in server time. HH:MM:SS is optional and 24-hour. Must be later than starting time for obvious reasons.", "Set end time", SQLtime()) as text + if(!endtime) + return + endtime = sanitizeSQL(endtime) + var/DBQuery/query_validate_time = dbcon.NewQuery("SELECT STR_TO_DATE('[endtime]','%Y-%c-%d %T')") + if(!query_validate_time.Execute()) + var/err = query_validate_time.ErrorMsg() + log_game("SQL ERROR validating endtime. Error : \[[err]\]\n") + return + if(query_validate_time.NextRow()) + world << "valdiate nextrow" + endtime = query_validate_time.item[1] + world << "endtime is [endtime]" + if(!endtime) + world << "not endtime" + src << "Datetime entered is invalid." + return + else + world << "endtime is valid" + else + world << "failed validate nextrow" + var/DBQuery/query_time_later = dbcon.NewQuery("SELECT DATE('[endtime]') < NOW()") + if(!query_time_later.Execute()) + var/err = query_time_later.ErrorMsg() + log_game("SQL ERROR comparing endtime to NOW(). Error : \[[err]\]\n") + return + if(query_time_later.NextRow()) + world << "checklate nextrow" + var/checklate = text2num(query_time_later.item[1]) + world << "checklate is [checklate]" + if(checklate) + world << "checklate is true" + src << "Datetime entered is not later than current server time." + return + else + world << "checklate false" + else + world << "checklate failed nextrow" + var/adminonly + switch(alert("Admin only poll?",,"Yes","No","Cancel")) + if("Yes") + adminonly = 1 + if("No") + adminonly = 0 + else + return + var/sql_ckey = sanitizeSQL(ckey) + var/question = input("Write your question","Question") as message + if(!question) + return + question = sanitizeSQL(question) + var/DBQuery/query_polladd_question = dbcon.NewQuery("INSERT INTO [format_table_name("poll_question")] (polltype, starttime, endtime, question, adminonly, multiplechoiceoptions, createdby_ckey, createdby_ip) VALUES ('[polltype]', '[starttime]', '[endtime]', '[question]', '[adminonly]', '[choice_amount]', '[sql_ckey]', '[address]')") + if(!query_polladd_question.Execute()) + var/err = query_polladd_question.ErrorMsg() + log_game("SQL ERROR adding new poll question to table. Error : \[[err]\]\n") + return + var/pollid = 0 + var/DBQuery/query_get_id = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_question")] WHERE question = '[question]' AND starttime = '[starttime]' AND endtime = '[endtime]' AND createdby_ckey = '[sql_ckey]' AND createdby_ip = '[address]'") + if(!query_get_id.Execute()) + var/err = query_get_id.ErrorMsg() + log_game("SQL ERROR obtaining id from poll_question table. Error : \[[err]\]\n") + return + if(query_get_id.NextRow()) + pollid = query_get_id.item[1] + if(polltype == "TEXT") + return + var/add_option = 1 + while(add_option) + var/option = input("Write your option","Option") as message + if(!option) + return + option = sanitizeSQL(option) + var/percentagecalc + switch(alert("Calculate option results as percentage?",,"Yes","No","Cancel")) + if("Yes") + percentagecalc = 1 + if("No") + percentagecalc = 0 + else + return + var/minval = 0 + var/maxval = 0 + var/descmin = "" + var/descmid = "" + var/descmax = "" + if(polltype == "NUMVAL") + minval = input("Set minimum rating value.","Minimum rating") as num + if(!minval) + return + maxval = input("Set maximum rating value.","Maximum rating") as num + if(!maxval) + return + if(minval >= maxval) + src << "Minimum rating value can't be more than maximum rating value" + return + descmin = input("Optional: Set description for minimum rating","Minimum rating description") as message + if(descmin) + descmin = sanitizeSQL(descmin) + descmid = input("Optional: Set description for median rating","Median rating description") as message + if(descmid) + descmid = sanitizeSQL(descmid) + descmax = input("Optional: Set description for maximum rating","Maximum rating description") as message + if(descmax) + descmax = sanitizeSQL(descmax) + var/DBQuery/query_polladd_option = dbcon.NewQuery("INSERT INTO [format_table_name("poll_option")] (pollid, text, percentagecalc, minval, maxval, descmin, descmid, descmax) VALUES ('[pollid]', '[option]', '[percentagecalc]', '[minval]', '[maxval]', '[descmin]', '[descmid]', '[descmax]')") + if(!query_polladd_option.Execute()) + var/err = query_polladd_option.ErrorMsg() + log_game("SQL ERROR adding new poll option to table. Error : \[[err]\]\n") + return + switch(alert(" ",,"Add option","Finish","Cancel")) + if("Add option") + add_option = 1 + if("Finish") + add_option = 0 + else + return \ No newline at end of file diff --git a/html/changelogs/jordie poll.yml b/html/changelogs/jordie poll.yml new file mode 100644 index 00000000000..d2d03cfa9b6 --- /dev/null +++ b/html/changelogs/jordie poll.yml @@ -0,0 +1,6 @@ +author: Jordie0608 + +delete-after: True + +changes: + - rscadd: "Added Special Verb 'Create Poll', an in-game interface to create server polls for admins with +permissions." diff --git a/tgstation.dme b/tgstation.dme index cba34acd1d9..098261ab2a2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -821,6 +821,7 @@ #include "code\modules\admin\banjob.dm" #include "code\modules\admin\create_mob.dm" #include "code\modules\admin\create_object.dm" +#include "code\modules\admin\create_poll.dm" #include "code\modules\admin\create_turf.dm" #include "code\modules\admin\holder2.dm" #include "code\modules\admin\IsBanned.dm"