diff --git a/.gitignore b/.gitignore index 4997e24..061c199 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ venv/ .env* !.env.example + +.vscode/ + +celerybeat-schedule \ No newline at end of file diff --git a/Pipfile b/Pipfile index c9adf2f..15877c5 100644 --- a/Pipfile +++ b/Pipfile @@ -6,47 +6,50 @@ verify_ssl = true [dev-packages] [packages] -amqp = "*" -appdirs = "*" -billiard = "*" -celery = "*" -certifi = "*" -chardet = "*" -click = "*" -gunicorn = "*" -humanize = "*" -idna = "*" -itsdangerous = "*" -kombu = "*" -numpy = "*" +amqp = "==2.5.2" +appdirs = "==1.4.3" +billiard = "==3.6.1.0" +celery = "==4.4.0" +certifi = "==2019.11.28" +chardet = "==3.0.4" +click = "==7.0" +gunicorn = "==20.0.4" +humanize = "==0.5.1" +idna = "==2.8" +itsdangerous = "==1.1.0" +kombu = "==4.6.7" +numpy = "==1.18.0" psycopg2 = "==2.7.6.1" -pyparsing = "*" -pytz = "*" -redis = "*" -requests = "*" -scipy = "*" -six = "*" -urllib3 = "*" -vine = "*" -webassets = "*" -xlrd = "*" -Flask = "*" -Flask-Assets = "*" -Flask-SQLAlchemy = "*" -Jinja2 = "*" -Markdown = "*" -MarkupSafe = "*" -pyScss = "*" -PyYAML = "*" -SQLAlchemy = "*" -Werkzeug = "*" -python-dotenv = "*" -flask-marshmallow = "*" -marshmallow-sqlalchemy = "*" -flask-compress = "*" -flask-minify = "*" -jsmin = "*" -cssmin = "*" +pyparsing = "==2.4.5" +pytz = "==2019.3" +redis = "==3.3.11" +requests = "==2.22.0" +scipy = "==1.4.1" +six = "==1.13.0" +urllib3 = "==1.25.7" +vine = "==1.3.0" +webassets = "==2.0" +xlrd = "==1.2.0" +Flask = "==1.1.1" +Flask-Assets = "==2.0" +Flask-SQLAlchemy = "==2.4.1" +Jinja2 = "==2.10.3" +Markdown = "==3.1.1" +MarkupSafe = "==1.1.1" +pyScss = "==1.3.5" +PyYAML = "==5.2" +SQLAlchemy = "==1.3.12" +Werkzeug = "==0.16.0" +python-dotenv = "==0.10.3" +flask-marshmallow = "==0.10.1" +marshmallow-sqlalchemy = "==0.21.0" +flask-compress = "==1.4.0" +flask-minify = "==0.15" +jsmin = "==2.2.2" +cssmin = "==0.2.0" +flask-socketio = "==4.2.1" +eventlet = "==0.25.1" +psycopg2-binary = "*" [requires] python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index 5010cb5..a45615b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "287967ad1ac855d95ecd8ded8f8490185d5085322921c4035821b1e3cacbeb0e" + "sha256": "da2eb27543bb8bd987406ef13feaaeb3e93950ac86877690c85ec33f81e87f09" }, "pipfile-spec": 6, "requires": { @@ -79,6 +79,21 @@ "index": "pypi", "version": "==0.2.0" }, + "dnspython": { + "hashes": [ + "sha256:36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01", + "sha256:f69c21288a962f4da86e56c4905b49d11aba7938d3d740e80d9e366ee4f1632d" + ], + "version": "==1.16.0" + }, + "eventlet": { + "hashes": [ + "sha256:658b1cd80937adc1a4860de2841e0528f64e2ca672885c4e00fc0e2217bde6b1", + "sha256:6c9c625af48424c4680d89314dbe45a76cc990cf002489f9469ff214b044ffc1" + ], + "index": "pypi", + "version": "==0.25.1" + }, "flask": { "hashes": [ "sha256:13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52", @@ -118,6 +133,14 @@ "index": "pypi", "version": "==0.15" }, + "flask-socketio": { + "hashes": [ + "sha256:2172dff1e42415ba480cee02c30c2fc833671ff326f1598ee3d69aa02cf768ec", + "sha256:7ff5b2f5edde23e875a8b0abf868584e5706e11741557449bc5147df2cd78268" + ], + "index": "pypi", + "version": "==4.2.1" + }, "flask-sqlalchemy": { "hashes": [ "sha256:0078d8663330dc05a74bc72b3b6ddc441b9a744e2f56fe60af1a5bfc81334327", @@ -126,6 +149,30 @@ "index": "pypi", "version": "==2.4.1" }, + "greenlet": { + "hashes": [ + "sha256:000546ad01e6389e98626c1367be58efa613fa82a1be98b0c6fc24b563acc6d0", + "sha256:0d48200bc50cbf498716712129eef819b1729339e34c3ae71656964dac907c28", + "sha256:23d12eacffa9d0f290c0fe0c4e81ba6d5f3a5b7ac3c30a5eaf0126bf4deda5c8", + "sha256:37c9ba82bd82eb6a23c2e5acc03055c0e45697253b2393c9a50cef76a3985304", + "sha256:51503524dd6f152ab4ad1fbd168fc6c30b5795e8c70be4410a64940b3abb55c0", + "sha256:8041e2de00e745c0e05a502d6e6db310db7faa7c979b3a5877123548a4c0b214", + "sha256:81fcd96a275209ef117e9ec91f75c731fa18dcfd9ffaa1c0adbdaa3616a86043", + "sha256:853da4f9563d982e4121fed8c92eea1a4594a2299037b3034c3c898cb8e933d6", + "sha256:8b4572c334593d449113f9dc8d19b93b7b271bdbe90ba7509eb178923327b625", + "sha256:9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc", + "sha256:9854f612e1b59ec66804931df5add3b2d5ef0067748ea29dc60f0efdcda9a638", + "sha256:99a26afdb82ea83a265137a398f570402aa1f2b5dfb4ac3300c026931817b163", + "sha256:a19bf883b3384957e4a4a13e6bd1ae3d85ae87f4beb5957e35b0be287f12f4e4", + "sha256:a9f145660588187ff835c55a7d2ddf6abfc570c2651c276d3d4be8a2766db490", + "sha256:ac57fcdcfb0b73bb3203b58a14501abb7e5ff9ea5e2edfa06bb03035f0cff248", + "sha256:bcb530089ff24f6458a81ac3fa699e8c00194208a724b644ecc68422e1111939", + "sha256:beeabe25c3b704f7d56b573f7d2ff88fc99f0138e43480cecdfcaa3b87fe4f87", + "sha256:d634a7ea1fc3380ff96f9e44d8d22f38418c1c381d5fac680b272d7d90883720", + "sha256:d97b0661e1aead761f0ded3b769044bb00ed5d33e1ec865e891a8b128bf7c656" + ], + "version": "==0.4.15" + }, "gunicorn": { "hashes": [ "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626", @@ -157,11 +204,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:073a852570f92da5f744a3472af1b61e28e9f78ccf0c9117658dc32b15de7b45", - "sha256:d95141fbfa7ef2ec65cfd945e2af7e5a6ddbd7c8d9a25e66ff3be8e3daf9f60f" + "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302", + "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b" ], "markers": "python_version < '3.8'", - "version": "==1.3.0" + "version": "==1.5.0" }, "itsdangerous": { "hashes": [ @@ -196,10 +243,10 @@ }, "lesscpy": { "hashes": [ - "sha256:72a38c751681e91e258825c1e826c38508c183f48b2e420e1a65d01eaa04bac3", - "sha256:f3c6d0b544c5bcdadcd3d8319feccb4128d06676d4117c6c9396ab39c25372ad" + "sha256:7b664f60818a16afa8cc9f1dd6d9b17f944e0ce94e50787d76f81bc7a8648cce", + "sha256:b0f2f853ee1dfb0891b147b57028057d5389510e079581e7b533d07dc0d95d3e" ], - "version": "==0.13.0" + "version": "==0.14.0" }, "markdown": { "hashes": [ @@ -215,13 +262,16 @@ "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", @@ -238,7 +288,9 @@ "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" ], "index": "pypi", "version": "==1.1.1" @@ -258,39 +310,39 @@ "index": "pypi", "version": "==0.21.0" }, - "more-itertools": { + "monotonic": { "hashes": [ - "sha256:b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d", - "sha256:c833ef592a0324bcc6a60e48440da07645063c453880c9477ceb22490aec1564" + "sha256:23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0", + "sha256:552a91f381532e33cbd07c6a2655a21908088962bb8fa7239ecbcc6ad1140cc7" ], - "version": "==8.0.2" + "version": "==1.5" }, "numpy": { "hashes": [ - "sha256:0a7a1dd123aecc9f0076934288ceed7fd9a81ba3919f11a855a7887cbe82a02f", - "sha256:0c0763787133dfeec19904c22c7e358b231c87ba3206b211652f8cbe1241deb6", - "sha256:3d52298d0be333583739f1aec9026f3b09fdfe3ddf7c7028cb16d9d2af1cca7e", - "sha256:43bb4b70585f1c2d153e45323a886839f98af8bfa810f7014b20be714c37c447", - "sha256:475963c5b9e116c38ad7347e154e5651d05a2286d86455671f5b1eebba5feb76", - "sha256:64874913367f18eb3013b16123c9fed113962e75d809fca5b78ebfbb73ed93ba", - "sha256:683828e50c339fc9e68720396f2de14253992c495fdddef77a1e17de55f1decc", - "sha256:6ca4000c4a6f95a78c33c7dadbb9495c10880be9c89316aa536eac359ab820ae", - "sha256:75fd817b7061f6378e4659dd792c84c0b60533e867f83e0d1e52d5d8e53df88c", - "sha256:7d81d784bdbed30137aca242ab307f3e65c8d93f4c7b7d8f322110b2e90177f9", - "sha256:8d0af8d3664f142414fd5b15cabfd3b6cc3ef242a3c7a7493257025be5a6955f", - "sha256:9679831005fb16c6df3dd35d17aa31dc0d4d7573d84f0b44cc481490a65c7725", - "sha256:a8f67ebfae9f575d85fa859b54d3bdecaeece74e3274b0b5c5f804d7ca789fe1", - "sha256:acbf5c52db4adb366c064d0b7c7899e3e778d89db585feadd23b06b587d64761", - "sha256:ada4805ed51f5bcaa3a06d3dd94939351869c095e30a2b54264f5a5004b52170", - "sha256:c7354e8f0eca5c110b7e978034cd86ed98a7a5ffcf69ca97535445a595e07b8e", - "sha256:e2e9d8c87120ba2c591f60e32736b82b67f72c37ba88a4c23c81b5b8fa49c018", - "sha256:e467c57121fe1b78a8f68dd9255fbb3bb3f4f7547c6b9e109f31d14569f490c3", - "sha256:ede47b98de79565fcd7f2decb475e2dcc85ee4097743e551fe26cfc7eb3ff143", - "sha256:f58913e9227400f1395c7b800503ebfdb0772f1c33ff8cb4d6451c06cabdf316", - "sha256:fe39f5fd4103ec4ca3cb8600b19216cd1ff316b4990f4c0b6057ad982c0a34d5" - ], - "index": "pypi", - "version": "==1.17.4" + "sha256:03bbde29ac8fba860bb2c53a1525b3604a9b60417855ac3119d89868ec6041c3", + "sha256:1baefd1fb4695e7f2e305467dbd876d765e6edd30c522894df76f8301efaee36", + "sha256:1c35fb1131362e6090d30286cfda52ddd42e69d3e2bf1fea190a0fad83ea3a18", + "sha256:3c68c827689ca0ca713dba598335073ce0966850ec0b30715527dce4ecd84055", + "sha256:443ab93fc35b31f01db8704681eb2fd82f3a1b2fa08eed2dd0e71f1f57423d4a", + "sha256:56710a756c5009af9f35b91a22790701420406d9ac24cf6b652b0e22cfbbb7ff", + "sha256:62506e9e4d2a39c87984f081a2651d4282a1d706b1a82fe9d50a559bb58e705a", + "sha256:6f8113c8dbfc192b58996ee77333696469ea121d1c44ea429d8fd266e4c6be51", + "sha256:712f0c32555132f4b641b918bdb1fd3c692909ae916a233ce7f50eac2de87e37", + "sha256:854f6ed4fa91fa6da5d764558804ba5b0f43a51e5fe9fc4fdc93270b052f188a", + "sha256:88c5ccbc4cadf39f32193a5ef22e3f84674418a9fd877c63322917ae8f295a56", + "sha256:905cd6fa6ac14654a6a32b21fad34670e97881d832e24a3ca32e19b455edb4a8", + "sha256:9d6de2ad782aae68f7ed0e0e616477fbf693d6d7cc5f0f1505833ff12f84a673", + "sha256:a30f5c3e1b1b5d16ec1f03f4df28e08b8a7529d8c920bbed657f4fde61f1fbcd", + "sha256:a9d72d9abaf65628f0f31bbb573b7d9304e43b1e6bbae43149c17737a42764c4", + "sha256:ac3cf835c334fcc6b74dc4e630f9b5ff7b4c43f7fb2a7813208d95d4e10b5623", + "sha256:b091e5d4cbbe79f0e8b6b6b522346e54a282eadb06e3fd761e9b6fafc2ca91ad", + "sha256:cc070fc43a494e42732d6ae2f6621db040611c1dde64762a40c8418023af56d7", + "sha256:e1080e37c090534adb2dd7ae1c59ee883e5d8c3e63d2a4d43c20ee348d0459c5", + "sha256:f084d513de729ff10cd72a1f80db468cff464fedb1ef2fea030221a0f62d7ff4", + "sha256:f6a7421da632fc01e8a3ecd19c3f7350258d82501a646747664bae9c6a87c731" + ], + "index": "pypi", + "version": "==1.18.0" }, "ply": { "hashes": [ @@ -335,6 +387,44 @@ "index": "pypi", "version": "==2.7.6.1" }, + "psycopg2-binary": { + "hashes": [ + "sha256:040234f8a4a8dfd692662a8308d78f63f31a97e1c42d2480e5e6810c48966a29", + "sha256:086f7e89ec85a6704db51f68f0dcae432eff9300809723a6e8782c41c2f48e03", + "sha256:18ca813fdb17bc1db73fe61b196b05dd1ca2165b884dd5ec5568877cabf9b039", + "sha256:19dc39616850342a2a6db70559af55b22955f86667b5f652f40c0e99253d9881", + "sha256:2166e770cb98f02ed5ee2b0b569d40db26788e0bf2ec3ae1a0d864ea6f1d8309", + "sha256:3a2522b1d9178575acee4adf8fd9f979f9c0449b00b4164bb63c3475ea6528ed", + "sha256:3aa773580f85a28ffdf6f862e59cb5a3cc7ef6885121f2de3fca8d6ada4dbf3b", + "sha256:3b5deaa3ee7180585a296af33e14c9b18c218d148e735c7accf78130765a47e3", + "sha256:407af6d7e46593415f216c7f56ba087a9a42bd6dc2ecb86028760aa45b802bd7", + "sha256:4c3c09fb674401f630626310bcaf6cd6285daf0d5e4c26d6e55ca26a2734e39b", + "sha256:4c6717962247445b4f9e21c962ea61d2e884fc17df5ddf5e35863b016f8a1f03", + "sha256:50446fae5681fc99f87e505d4e77c9407e683ab60c555ec302f9ac9bffa61103", + "sha256:5057669b6a66aa9ca118a2a860159f0ee3acf837eda937bdd2a64f3431361a2d", + "sha256:5dd90c5438b4f935c9d01fcbad3620253da89d19c1f5fca9158646407ed7df35", + "sha256:659c815b5b8e2a55193ede2795c1e2349b8011497310bb936da7d4745652823b", + "sha256:69b13fdf12878b10dc6003acc8d0abf3ad93e79813fd5f3812497c1c9fb9be49", + "sha256:7a1cb80e35e1ccea3e11a48afe65d38744a0e0bde88795cc56a4d05b6e4f9d70", + "sha256:7e6e3c52e6732c219c07bd97fff6c088f8df4dae3b79752ee3a817e6f32e177e", + "sha256:7f42a8490c4fe854325504ce7a6e4796b207960dabb2cbafe3c3959cb00d1d7e", + "sha256:84156313f258eafff716b2961644a4483a9be44a5d43551d554844d15d4d224e", + "sha256:8578d6b8192e4c805e85f187bc530d0f52ba86c39172e61cd51f68fddd648103", + "sha256:890167d5091279a27e2505ff0e1fb273f8c48c41d35c5b92adbf4af80e6b2ed6", + "sha256:98e10634792ac0e9e7a92a76b4991b44c2325d3e7798270a808407355e7bb0a1", + "sha256:9aadff9032e967865f9778485571e93908d27dab21d0fdfdec0ca779bb6f8ad9", + "sha256:9f24f383a298a0c0f9b3113b982e21751a8ecde6615494a3f1470eb4a9d70e9e", + "sha256:a73021b44813b5c84eda4a3af5826dd72356a900bac9bd9dd1f0f81ee1c22c2f", + "sha256:afd96845e12638d2c44d213d4810a08f4dc4a563f9a98204b7428e567014b1cd", + "sha256:b73ddf033d8cd4cc9dfed6324b1ad2a89ba52c410ef6877998422fcb9c23e3a8", + "sha256:b8f490f5fad1767a1331df1259763b3bad7d7af12a75b950c2843ba319b2415f", + "sha256:dbc5cd56fff1a6152ca59445178652756f4e509f672e49ccdf3d79c1043113a4", + "sha256:eac8a3499754790187bb00574ab980df13e754777d346f85e0ff6df929bcd964", + "sha256:eaed1c65f461a959284649e37b5051224f4db6ebdc84e40b5e65f2986f101a08" + ], + "index": "pypi", + "version": "==2.8.4" + }, "pyparsing": { "hashes": [ "sha256:20f995ecd72f2a1f4bf6b072b63b22e2eb457836601e76d6e5dfcd75436acc1f", @@ -358,6 +448,20 @@ "index": "pypi", "version": "==0.10.3" }, + "python-engineio": { + "hashes": [ + "sha256:47ae4a9b3b4f2e8a68929f37a518338838e119f24c9a9121af92c49f8bea55c3", + "sha256:c3a3822deb51fdf9c7fe4d78abf807c73b83ea538036a50862d3024450746253" + ], + "version": "==3.11.2" + }, + "python-socketio": { + "hashes": [ + "sha256:48cba5b827ac665dbf923a4f5ec590812aed5299a831fc43576a9af346272534", + "sha256:af6c23c35497960f82106e36688123ecb52ad5a77d0ca27954ff3811c4d9d562" + ], + "version": "==4.4.0" + }, "pytz": { "hashes": [ "sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d", @@ -528,10 +632,10 @@ }, "zipp": { "hashes": [ - "sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e", - "sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335" + "sha256:ccc94ed0909b58ffe34430ea5451f07bc0c76467d7081619a454bf5c98b89e28", + "sha256:feae2f18633c32fc71f2de629bfb3bd3c9325cd4419642b1f1da42ee488d9b98" ], - "version": "==0.6.0" + "version": "==2.1.0" } }, "develop": {} diff --git a/Procfile b/Procfile index 1562dbb..093ba7e 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -worker: PYTHONUNBUFFERED=true celery -A gavel:celery worker -B -E --loglevel=info -web: python initialize.py && gunicorn gavel:app +worker: PYTHONUNBUFFERED=true celery -A gavel:celery worker -E -P eventlet --loglevel=info +web: python initialize.py && gunicorn -k eventlet gavel:app diff --git a/gavel/__init__.py b/gavel/__init__.py index 7f7d4a5..3760463 100644 --- a/gavel/__init__.py +++ b/gavel/__init__.py @@ -8,6 +8,9 @@ from flask import Flask from flask_compress import Compress from flask_minify import minify +from flask_socketio import SocketIO +import eventlet +eventlet.monkey_patch(os=True, select=True, socket=True, thread=True, time=True, psycopg=True) COMPRESS_MIMETYPES = [ 'text/html', @@ -57,9 +60,8 @@ def start_app(): output='all.css' ), 'admin_js': Bundle( - 'js/admin/jquery.tablesorter.min.js', - 'js/admin/jquery.tablesorter.widgets.js', 'js/admin/admin_live.js', + 'js/admin/admin_service.js', depends='**/*.js', filters=('jsmin',), output='admin_all.js' @@ -81,6 +83,11 @@ def start_app(): ma.app = app ma.init_app(app) +SOCKETIO_REDIS_URL = settings.BROKER_URI +async_mode="eventlet" + +socketio = SocketIO(app, async_mode=async_mode, message_queue=SOCKETIO_REDIS_URL, async_handlers=True) + import gavel.template_filters # registers template filters import gavel.controllers # registers controllers @@ -93,4 +100,4 @@ def start_app(): 'min-views': settings.MIN_VIEWS, 'timeout': settings.TIMEOUT, 'disable-email': settings.DISABLE_EMAIL -}) +}) \ No newline at end of file diff --git a/gavel/controllers/__init__.py b/gavel/controllers/__init__.py index 5867866..51d4c2a 100644 --- a/gavel/controllers/__init__.py +++ b/gavel/controllers/__init__.py @@ -4,3 +4,4 @@ import gavel.controllers.api import gavel.controllers.judge import gavel.controllers.error +import gavel.controllers.socket diff --git a/gavel/controllers/admin.py b/gavel/controllers/admin.py index 4eb2bae..ba4a54a 100644 --- a/gavel/controllers/admin.py +++ b/gavel/controllers/admin.py @@ -1,4 +1,5 @@ from gavel import app +from gavel import socketio from gavel.models import * from gavel.constants import * from functools import wraps @@ -11,6 +12,9 @@ url_for, json) +socket = socketio +from sqlalchemy import event + try: import urllib except ImportError: @@ -19,7 +23,8 @@ import asyncio -loop = asyncio.get_event_loop() +loop = asyncio.new_event_loop() +asyncio.set_event_loop(loop) def async_action(f): @wraps(f) @@ -144,12 +149,23 @@ def admin_items(): item_counts[w] = item_counts.get(w, 0) + 1 item_counts[l] = item_counts.get(l, 0) + 1 + items_dumped = [] + + for it in items: + try: + item_dumped = it.to_dict() + item_dumped.update({ + 'viewed': len(viewed.get(it.id, 0)), + 'votes': item_counts.get(it.id, 0), + 'skipped': skipped.get(it.id, 0) + }) + items_dumped.append(item_dumped) + except: + items_dumped.append({'null': 'null'}) + dump_data = { - "items": [it.to_dict() if it else {'null': 'null'} for it in items], - "viewed": viewed, - "skipped": skipped, - "item_count": item_count, - "item_counts": item_counts + "items": items_dumped, + "item_count": item_count } response = app.response_class( @@ -197,6 +213,7 @@ def admin_flags(): def admin_annotators(): annotators = Annotator.query.order_by(Annotator.id).all() decisions = Decision.query.all() + annotator_count = len(annotators) counts = {} @@ -206,9 +223,20 @@ def admin_annotators(): l = d.loser_id counts[a] = counts.get(a, 0) + 1 + annotators_dumped = [] + + for an in annotators: + try: + annotator_dumped = an.to_dict() + annotator_dumped.update({ + 'votes': counts.get(an.id, 0) + }) + annotators_dumped.append(annotator_dumped) + except: + annotators_dumped.append({'null': 'null'}) dump_data = { - "annotators": [an.to_dict() if an else {'null': 'null'} for an in annotators], - "counts": counts + "annotators": annotators_dumped, + "anotator_count": annotator_count } response = app.response_class( @@ -285,26 +313,34 @@ def item(): for index, row in enumerate(data): if len(row) != 3: return utils.user_error('Bad data: row %d has %d elements (expecting 3)' % (index + 1, len(row))) - for row in data: - _item = Item(*row) - db.session.add(_item) - db.session.commit() + def tx(): + for row in data: + _item = Item(*row) + db.session.add(_item) + db.session.commit() + with_retries(tx) elif action == 'Prioritize' or action == 'Cancel': item_id = request.form['item_id'] target_state = action == 'Prioritize' - Item.by_id(item_id).prioritized = target_state - db.session.commit() + def tx(): + Item.by_id(item_id).prioritized = target_state + db.session.commit() + with_retries(tx) elif action == 'Disable' or action == 'Enable': item_id = request.form['item_id'] target_state = action == 'Enable' - Item.by_id(item_id).active = target_state - db.session.commit() + def tx(): + Item.by_id(item_id).active = target_state + db.session.commit() + with_retries(tx) elif action == 'Delete': item_id = request.form['item_id'] try: - db.session.execute(ignore_table.delete(ignore_table.c.item_id == item_id)) - Item.query.filter_by(id=item_id).delete() - db.session.commit() + def tx(): + db.session.execute(ignore_table.delete(ignore_table.c.item_id == item_id)) + Item.query.filter_by(id=item_id).delete() + db.session.commit() + with_retries(tx) except IntegrityError as e: return utils.server_error(str(e)) elif action == 'BatchDisable': @@ -312,23 +348,31 @@ def item(): error = [] for item_id in item_ids: try: - Item.by_id(item_id).active = False - db.session.commit() + def tx(): + Item.by_id(item_id).active = False + db.session.commit() + with_retries(tx) except: error.append(item_id) - db.session.rollback() + def tx(): + db.session.rollback() + with_retries(tx) elif action == 'BatchDelete': db.Session.autocommit = True item_ids = request.form.getlist('ids') error = [] for item_id in item_ids: try: - db.session.execute(ignore_table.delete(ignore_table.c.item_id == item_id)) - Item.query.filter_by(id=item_id).delete() - db.session.commit() + def tx(): + db.session.execute(ignore_table.delete(ignore_table.c.item_id == item_id)) + Item.query.filter_by(id=item_id).delete() + db.session.commit() + with_retries(tx) except Exception as e: error.append(str(e)) - db.session.rollback() + def tx(): + db.session.rollback() + with_retries(tx) continue return redirect(url_for('admin')) @@ -342,14 +386,18 @@ def queue_shutdown(): for an in annotators: if an.active: an.stop_next = True - Setting.set(SETTING_STOP_QUEUE, True) - db.session.commit() + def tx(): + Setting.set(SETTING_STOP_QUEUE, True) + db.session.commit() + with_retries(tx) elif action == 'dequeue': for an in annotators: if an.stop_next: an.stop_next = False - Setting.set(SETTING_STOP_QUEUE, False) - db.session.commit() + def tx(): + Setting.set(SETTING_STOP_QUEUE, False) + db.session.commit() + with_retries(tx) return redirect(url_for('admin')) @@ -361,13 +409,17 @@ def flag(): if action == 'resolve': flag_id = request.form['flag_id'] target_state = action == 'resolve' - Flag.by_id(flag_id).resolved = target_state - db.session.commit() + def tx(): + Flag.by_id(flag_id).resolved = target_state + db.session.commit() + with_retries(tx) elif action == 'open': flag_id = request.form['flag_id'] target_state = 1 == 2 - Flag.by_id(flag_id).resolved = target_state - db.session.commit() + def tx(): + Flag.by_id(flag_id).resolved = target_state + db.session.commit() + with_retries(tx) return redirect(url_for('admin')) @@ -397,33 +449,37 @@ def parse_upload_form(): @app.route('/admin/item_patch', methods=['POST']) @utils.requires_auth def item_patch(): - item = Item.by_id(request.form['item_id']) - if not item: - return utils.user_error('Item %s not found ' % request.form['item_id']) - if 'location' in request.form: - item.location = request.form['location'] - if 'name' in request.form: - item.name = request.form['name'] - if 'description' in request.form: - item.description = request.form['description'] - db.session.commit() - return redirect(url_for('item_detail', item_id=item.id)) + def tx(): + item = Item.by_id(request.form['item_id']) + if not item: + return utils.user_error('Item %s not found ' % request.form['item_id']) + if 'location' in request.form: + item.location = request.form['location'] + if 'name' in request.form: + item.name = request.form['name'] + if 'description' in request.form: + item.description = request.form['description'] + db.session.commit() + with_retries(tx) + return redirect(url_for('item_detail', item_id=request.form['item_id'])) @app.route('/admin/annotator_patch', methods=['POST']) @utils.requires_auth def annotator_patch(): - annotator = Annotator.by_id(request.form['annotator_id']) - if not item: - return utils.user_error('Annotator %s not found ' % request.form['annotator_id']) - if 'name' in request.form: - annotator.name = request.form['name'] - if 'email' in request.form: - annotator.email = request.form['email'] - if 'description' in request.form: - annotator.description = request.form['description'] - db.session.commit() - return redirect(url_for('annotator_detail', annotator_id=annotator.id)) + def tx(): + annotator = Annotator.by_id(request.form['annotator_id']) + if not item: + return utils.user_error('Annotator %s not found ' % request.form['annotator_id']) + if 'name' in request.form: + annotator.name = request.form['name'] + if 'email' in request.form: + annotator.email = request.form['email'] + if 'description' in request.form: + annotator.description = request.form['description'] + db.session.commit() + with_retries(tx) + return redirect(url_for('annotator_detail', annotator_id=request.form['annotator_id'])) @app.route('/admin/annotator', methods=['POST']) @@ -438,11 +494,13 @@ def annotator(): for index, row in enumerate(data): if len(row) != 3: return utils.user_error('Bad data: row %d has %d elements (expecting 3)' % (index + 1, len(row))) - for row in data: - annotator = Annotator(*row) - added.append(annotator) - db.session.add(annotator) - db.session.commit() + def tx(): + for row in data: + annotator = Annotator(*row) + added.append(annotator) + db.session.add(annotator) + db.session.commit() + with_retries(tx) try: email_invite_links(added) except Exception as e: @@ -456,14 +514,18 @@ def annotator(): elif action == 'Disable' or action == 'Enable': annotator_id = request.form['annotator_id'] target_state = action == 'Enable' - Annotator.by_id(annotator_id).active = target_state - db.session.commit() + def tx(): + Annotator.by_id(annotator_id).active = target_state + db.session.commit() + with_retries(tx) elif action == 'Delete': annotator_id = request.form['annotator_id'] try: - db.session.execute(ignore_table.delete(ignore_table.c.annotator_id == annotator_id)) - Annotator.query.filter_by(id=annotator_id).delete() - db.session.commit() + def tx(): + db.session.execute(ignore_table.delete(ignore_table.c.annotator_id == annotator_id)) + Annotator.query.filter_by(id=annotator_id).delete() + db.session.commit() + with_retries(tx) except IntegrityError as e: return utils.server_error(str(e)) elif action == 'BatchDisable': @@ -471,10 +533,14 @@ def annotator(): errored = [] for annotator_id in annotator_ids: try: - Annotator.by_id(annotator_id).active = False - db.session.commit() + def tx(): + Annotator.by_id(annotator_id).active = False + db.session.commit() + with_retries(tx) except: - db.session.rollback() + def tx(): + db.session.rollback() + with_retries(tx) errored.append(annotator_id) continue elif action == 'BatchDelete': @@ -482,11 +548,15 @@ def annotator(): errored = [] for annotator_id in annotator_ids: try: - db.session.execute(ignore_table.delete(ignore_table.c.annotator_id == annotator_id)) - Annotator.query.filter_by(id=annotator_id).delete() - db.session.commit() + def tx(): + db.session.execute(ignore_table.delete(ignore_table.c.annotator_id == annotator_id)) + Annotator.query.filter_by(id=annotator_id).delete() + db.session.commit() + with_retries(tx) except: - db.session.rollback() + def tx(): + db.session.rollback() + with_retries(tx) errored.append(annotator_id) continue return redirect(url_for('admin')) diff --git a/gavel/controllers/csrf_protection.py b/gavel/controllers/csrf_protection.py index 470ffed..768529e 100644 --- a/gavel/controllers/csrf_protection.py +++ b/gavel/controllers/csrf_protection.py @@ -5,7 +5,7 @@ @app.before_request def csrf_protect(): if request.method == "POST": - token = session.pop('_csrf_token', None) + token = session.get('_csrf_token', None) if not token or token != request.form.get('_csrf_token'): abort(403) diff --git a/gavel/controllers/judge.py b/gavel/controllers/judge.py index 029e4b5..da513e7 100644 --- a/gavel/controllers/judge.py +++ b/gavel/controllers/judge.py @@ -65,7 +65,7 @@ def index(): ) if not annotator.read_welcome: return redirect(url_for('welcome')) - maybe_init_annotator(annotator) + maybe_init_annotator() if annotator.next is None: return render_template( 'wait.html', @@ -79,82 +79,80 @@ def index(): @app.route('/vote', methods=['POST']) @requires_open(redirect_to='index') @requires_active_annotator(redirect_to='index') -def vote(retries=0): - annotator = get_current_annotator() - if annotator.prev.id == int(request.form['prev_id']) and annotator.next.id == int(request.form['next_id']): - if request.form['action'] in ['Skip', 'SkipAbsent', 'SkipBusy']: - annotator.ignore.append(annotator.next) +def vote(): + def tx(): + annotator = get_current_annotator() + if annotator.prev.id == int(request.form['prev_id']) and annotator.next.id == int(request.form['next_id']): + if request.form['action'] in ['Skip', 'SkipAbsent', 'SkipBusy']: + annotator.ignore.append(annotator.next) - if request.form['action'] == 'SkipAbsent': - flag = Flag(annotator, annotator.next, 'Absent') - db.session.add(flag) - else: - # ignore things that were deactivated in the middle of judging - if annotator.prev.active and annotator.next.active: - if request.form['action'] == 'Previous': - perform_vote(annotator, next_won=False) - decision = Decision(annotator, winner=annotator.prev, loser=annotator.next) - elif request.form['action'] == 'Current': - perform_vote(annotator, next_won=True) - decision = Decision(annotator, winner=annotator.next, loser=annotator.prev) - else: - return - db.session.add(decision) - annotator.next.viewed.append(annotator) # counted as viewed even if deactivated - annotator.prev = annotator.next - annotator.ignore.append(annotator.prev) - if annotator.stop_next: - annotator.active = False - annotator.update_next(choose_next(annotator)) - try: - db.session.commit() - except Exception as e: - if retries < 3: - db.session.rollback() - # Try again - vote(retries+1) + if request.form['action'] == 'SkipAbsent': + flag = Flag(annotator, annotator.next, 'Absent') + db.session.add(flag) else: - raise Exception("Judging commit error: " + e) + # ignore things that were deactivated in the middle of judging + if annotator.prev.active and annotator.next.active: + if request.form['action'] == 'Previous': + perform_vote(annotator, next_won=False) + decision = Decision(annotator, winner=annotator.prev, loser=annotator.next) + elif request.form['action'] == 'Current': + perform_vote(annotator, next_won=True) + decision = Decision(annotator, winner=annotator.next, loser=annotator.prev) + else: + return + db.session.add(decision) + annotator.next.viewed.append(annotator) # counted as viewed even if deactivated + annotator.prev = annotator.next + annotator.ignore.append(annotator.prev) + if annotator.stop_next: + annotator.active = False + annotator.update_next(choose_next(annotator)) + db.session.commit() + with_retries(tx) return redirect(url_for('index')) @app.route('/report', methods=['POST']) @requires_open(redirect_to='index') @requires_active_annotator(redirect_to='index') def report(): - annotator = get_current_annotator() - reason = request.form['reason'] - if reason in ['Unknown', '']: - return - if annotator.next.id == int(request.form['next_id']): - flag = Flag(annotator, annotator.next, reason) - db.session.add(flag) - annotator.ignore.append(annotator.next) - if annotator.prev: - annotator.update_next(choose_next(annotator)) - else: - annotator.next = None - db.session.commit() + def tx(): + annotator = get_current_annotator() + reason = request.form['reason'] + if reason in ['Unknown', '']: + return + if annotator.next.id == int(request.form['next_id']): + flag = Flag(annotator, annotator.next, reason) + db.session.add(flag) + annotator.ignore.append(annotator.next) + if annotator.prev: + annotator.update_next(choose_next(annotator)) + else: + annotator.next = None + db.session.commit() + with_retries(tx) return redirect(url_for('index')) @app.route('/begin', methods=['POST']) @requires_open(redirect_to='index') @requires_active_annotator(redirect_to='index') def begin(): - annotator = get_current_annotator() - if annotator.next.id == int(request.form['item_id']): - annotator.ignore.append(annotator.next) - if request.form['action'] == 'Done': - annotator.next.viewed.append(annotator) - annotator.prev = annotator.next - annotator.update_next(choose_next(annotator)) - elif request.form['action'] in ['Skip', 'SkipAbsent', 'SkipBusy']: - if request.form['action'] == 'SkipAbsent': - flag = Flag(annotator, annotator.next, 'Absent') - db.session.add(flag) - annotator.next = None # will be reset in index - if annotator.stop_next: - annotator.active = False - db.session.commit() + def tx(): + annotator = get_current_annotator() + if annotator.next.id == int(request.form['item_id']): + annotator.ignore.append(annotator.next) + if request.form['action'] == 'Done': + annotator.next.viewed.append(annotator) + annotator.prev = annotator.next + annotator.update_next(choose_next(annotator)) + elif request.form['action'] in ['Skip', 'SkipAbsent', 'SkipBusy']: + if request.form['action'] == 'SkipAbsent': + flag = Flag(annotator, annotator.next, 'Absent') + db.session.add(flag) + annotator.next = None # will be reset in index + if annotator.stop_next: + annotator.active = False + db.session.commit() + with_retries(tx) return redirect(url_for('index')) @app.route('/logout') @@ -184,10 +182,12 @@ def welcome(): @requires_open(redirect_to='index') @requires_active_annotator(redirect_to='index') def welcome_done(): - annotator = get_current_annotator() - if request.form['action'] == 'Done': - annotator.read_welcome = True - db.session.commit() + def tx(): + annotator = get_current_annotator() + if request.form['action'] == 'Done': + annotator.read_welcome = True + db.session.commit() + with_retries(tx) return redirect(url_for('index')) @app.route('/welcome/instructions/') @@ -234,12 +234,15 @@ def preferred_items(annotator): return less_seen if less_seen else preferred -def maybe_init_annotator(annotator): - if annotator.next is None: - items = preferred_items(annotator) - if items: - annotator.update_next(choice(items)) - db.session.commit() +def maybe_init_annotator(): + def tx(): + annotator = get_current_annotator() + if annotator.next is None: + items = preferred_items(annotator) + if items: + annotator.update_next(choice(items)) + db.session.commit() + with_retries(tx) def choose_next(annotator): items = preferred_items(annotator) diff --git a/gavel/controllers/socket.py b/gavel/controllers/socket.py new file mode 100644 index 0000000..5a89e50 --- /dev/null +++ b/gavel/controllers/socket.py @@ -0,0 +1,182 @@ +from gavel import app +from gavel import celery +from gavel import socketio +from flask_socketio import emit +from gavel.constants import * +from gavel.models import * +import gavel.settings as settings +import gavel.utils as utils +from sqlalchemy import event +from sqlalchemy import (or_, not_) +from flask import (json) +import asyncio + +loop = asyncio.new_event_loop() +asyncio.set_event_loop(loop) + +def standardize(target): + try: + name = target.__tablename__ + if str(name) == 'annotator': + return { + 'type': name, + 'target': json.dumps(injectAnnotator(target, target.to_dict())) + } + elif str(name) == 'flag': + return { + 'type': name, + 'target': json.dumps(injectFlag(target, target.to_dict())) + } + elif str(name) == 'item': + return { + 'type': name, + 'target': json.dumps(injectItem(target, target.to_dict())) + } + elif str(name) == 'setting': + settings = Setting.query.all() + return { + 'type': name, + 'target': json.dumps([it.to_dict() for it in Setting.query.all()]) + } + else: + return { + 'type': name, + 'target': json.dumps(target.to_dict()) + } + except Exception as e: + print(str(e)) + return { + 'type': "ERROR", + 'target': json.dumps({'error': 'true'}) + } + +def injectAnnotator(target, target_dumped): + count = Decision.query.filter(Decision.annotator_id == target.id).count() + target_dumped.update({ + 'votes': count + }) + + return target_dumped + +def injectFlag(target, target_dumped): + target_dumped.update({ + 'item_name': target.item.name, + 'item_location': target.item.location, + 'annotator_name': target.annotator.name + }) + return target_dumped + +@celery.task +def injectItem(target, target_dumped): + assigned = Annotator.query.filter(Annotator.next == target).all() + viewed_ids = {i.id for i in target.viewed} + if viewed_ids: + skipped = Annotator.query.filter( + Annotator.ignore.contains(target) & ~Annotator.id.in_(viewed_ids) + ).count() + else: + skipped = Annotator.query.filter(Annotator.ignore.contains(target)).count() + + viewed = len(target.viewed) + + target_dumped.update({ + 'viewed': viewed, + 'votes': Decision.query.filter(or_(Decision.winner_id == target.id, Decision.loser_id == target.id)).distinct(Decision.id).count(), + 'skipped': skipped + }) + return target_dumped + +CONNECT = 'connected' + +ANNOTATOR_INSERTED = 'annotator.inserted' +ANNOTATOR_UPDATED = 'annotator.updated' +ANNOTATOR_DELETED = 'annotator.deleted' + +ITEM_INSERTED = 'item.inserted' +ITEM_UPDATED = 'item.updated' +ITEM_DELETED = 'item.deleted' + +FLAG_INSERTED = 'flag.inserted' +FLAG_UPDATED = 'flag.updated' +FLAG_DELETED = 'flag.deleted' + +SETTING_INSERTED = 'setting.inserted' +SETTING_UPDATED = 'setting.updated' +SETTING_DELETED = 'setting.deleted' + +@socketio.on('user.connected', namespace='/admin') +def test_connect(data): + emit(CONNECT, data, namespace='/admin') + +@socketio.on('annotator.updated.confirmed', namespace='/admin') +@utils.requires_auth +def runRelatedItemUpdates(data): + triggerRelatedItemUpdates.apply_async(args=[data]) + +@celery.task(name='socket.triggerRelatedItemUpdates') +def triggerRelatedItemUpdates(data): + try: + ignore_ids = {i['id'] for i in data['ignore']} + items = Item.query.filter(Item.id.in_(ignore_ids)) + for i in items: + socketio.emit(ITEM_UPDATED, {'type': "item", 'target': json.dumps(injectItem.delay(i, i.to_dict()))}, namespace='/admin') + except Exception as e: + return + +@event.listens_for(Annotator, 'after_insert') +@utils.requires_auth +def annotator_listen_insert(mapper, connection, target): + socketio.emit(ANNOTATOR_INSERTED, standardize(target), namespace='/admin') + +@event.listens_for(Annotator, 'after_update') +@utils.requires_auth +def annotator_listen_modify(mapper, connection, target): + socketio.emit(ANNOTATOR_UPDATED, standardize(target), namespace='/admin') + +@event.listens_for(Annotator, 'after_delete') +@utils.requires_auth +def annotator_listen_delete(mapper, connection, target): + print(str(target), str(mapper)) + socketio.emit(ANNOTATOR_DELETED, {"target": json.dumps(target.to_dict())}, namespace='/admin') + +@event.listens_for(Item, 'after_insert') +@utils.requires_auth +def item_listen_insert(mapper, connection, target): + socketio.emit(ITEM_INSERTED, standardize(target), namespace='/admin') + +@event.listens_for(Item, 'after_update') +@utils.requires_auth +def item_listen_modify(mapper, connection, target): + socketio.emit(ITEM_UPDATED, standardize(target), namespace='/admin') + +@event.listens_for(Item, 'after_delete') +@utils.requires_auth +def item_listen_delete(mapper, connection, target): + print(str(target), str(mapper)) + socketio.emit(ITEM_DELETED, {"target": json.dumps(target.to_dict())}, namespace='/admin') + +@event.listens_for(Flag, 'after_insert') +@utils.requires_auth +def flag_listen_insert(mapper, connection, target): + socketio.emit(FLAG_INSERTED, standardize(target), namespace='/admin') + +@event.listens_for(Flag, 'after_update') +@utils.requires_auth +def flag_listen_update(mapper, connection, target): + socketio.emit(FLAG_UPDATED, standardize(target), namespace='/admin') + +@event.listens_for(Flag, 'after_delete') +@utils.requires_auth +def flag_listen_delete(mapper, connection, target): + print(str(target), str(mapper)) + socketio.emit(FLAG_DELETED, {"target": json.dumps(target.to_dict())}, namespace='/admin') + +@event.listens_for(Setting, 'after_insert') +@utils.requires_auth +def setting_listen_insert(mapper, connection, target): + socketio.emit(SETTING_INSERTED, standardize(target), namespace='/admin') + +@event.listens_for(Setting, 'after_update') +@utils.requires_auth +def setting_listen_update(mapper, connection, target): + socketio.emit(SETTING_UPDATED, standardize(target), namespace='/admin') \ No newline at end of file diff --git a/gavel/models/__init__.py b/gavel/models/__init__.py index a115e72..8a6433c 100644 --- a/gavel/models/__init__.py +++ b/gavel/models/__init__.py @@ -1,7 +1,8 @@ import gavel.crowd_bt as crowd_bt from flask_sqlalchemy import SQLAlchemy from flask_marshmallow import Marshmallow - +import sqlalchemy.exc +import psycopg2.errors class SerializableAlchemy(SQLAlchemy): def apply_driver_hacks(self, app, info, options): @@ -22,3 +23,20 @@ def apply_driver_hacks(self, app, info, options): from sqlalchemy.exc import IntegrityError from sqlalchemy.sql.expression import desc + +def with_retries(tx_func): + ''' + Keep retrying a function that involves a database transaction until it + succeeds. + This only retries due to serialization failures; all other types of + exceptions are re-raised. + ''' + while True: + try: + tx_func() + except sqlalchemy.exc.OperationalError as err: + if not isinstance(err.orig, psycopg2.errors.SerializationFailure): + raise + db.session.rollback() + else: + break \ No newline at end of file diff --git a/gavel/models/_basemodel.py b/gavel/models/_basemodel.py index 6c4df98..b5697ba 100644 --- a/gavel/models/_basemodel.py +++ b/gavel/models/_basemodel.py @@ -9,6 +9,7 @@ class BaseModel(db.Model): __abstract__ = True +# Begin to_dict def to_dict(self, show=None, _hide=[], _path=None): """Return a dictionary representation of this model.""" @@ -16,7 +17,7 @@ def to_dict(self, show=None, _hide=[], _path=None): hidden = self._hidden_fields if hasattr(self, "_hidden_fields") else [] default = self._default_fields if hasattr(self, "_default_fields") else [] - default.extend(['id', 'modified_at', 'created_at']) + default.extend(['id', 'modified_at', 'created_at', self.__tablename__.lower()]) if not _path: _path = self.__tablename__.lower() @@ -116,3 +117,4 @@ def prepend_path(item): pass return ret_data +# End to_dict \ No newline at end of file diff --git a/gavel/models/annotator.py b/gavel/models/annotator.py index 3752782..9736636 100644 --- a/gavel/models/annotator.py +++ b/gavel/models/annotator.py @@ -24,7 +24,7 @@ class Annotator(BaseModel): secret = db.Column(db.String(32), unique=True, nullable=False) next_id = db.Column(db.Integer, db.ForeignKey('item.id')) next = db.relationship('Item', foreign_keys=[next_id], uselist=False) - updated = db.Column(db.DateTime) + updated = db.Column(db.DateTime, onupdate=datetime.utcnow) prev_id = db.Column(db.Integer, db.ForeignKey('item.id')) prev = db.relationship('Item', foreign_keys=[prev_id], uselist=False) ignore = db.relationship('Item', secondary=ignore_table) diff --git a/gavel/models/decision.py b/gavel/models/decision.py index f345409..0e8d66c 100644 --- a/gavel/models/decision.py +++ b/gavel/models/decision.py @@ -12,11 +12,13 @@ class Decision(BaseModel): loser_id = db.Column(db.Integer, db.ForeignKey('item.id')) loser = db.relationship('Item', foreign_keys=[loser_id], uselist=False) time = db.Column(db.DateTime, default=datetime.utcnow, nullable=False) + updated = db.Column(db.DateTime, onupdate=datetime.utcnow) _default_fields = ["annotator_id", "winner_id", "loser_id", - "time"] + "time", + "updated"] def __init__(self, annotator, winner, loser): self.annotator = annotator diff --git a/gavel/models/flag.py b/gavel/models/flag.py index 118ea2c..fee7d87 100644 --- a/gavel/models/flag.py +++ b/gavel/models/flag.py @@ -14,8 +14,9 @@ class Flag(BaseModel): reason = db.Column(db.Text, nullable=False) resolved = db.Column(db.Boolean, default=False, nullable=False) time = db.Column(db.DateTime, default=datetime.utcnow, nullable=False) + updated = db.Column(db.DateTime, onupdate=datetime.utcnow) - _default_fields = ["annotator_id","item_id","reason","resolved","time"] + _default_fields = ["annotator_id","item_id","reason","resolved","time", "updated"] relations_keys = ("item", "annotator") diff --git a/gavel/models/item.py b/gavel/models/item.py index 7fd9a20..a3d674c 100644 --- a/gavel/models/item.py +++ b/gavel/models/item.py @@ -1,6 +1,7 @@ from gavel.models import db import gavel.crowd_bt as crowd_bt from sqlalchemy.orm.exc import NoResultFound +from datetime import datetime from gavel.models._basemodel import BaseModel @@ -19,11 +20,12 @@ class Item(BaseModel): viewed = db.relationship('Annotator', secondary=view_table) prioritized = db.Column(db.Boolean, default=False, nullable=False) flags = db.relationship('Flag', back_populates="item") + updated = db.Column(db.DateTime, onupdate=datetime.utcnow) mu = db.Column(db.Float) sigma_sq = db.Column(db.Float) - _default_fields = ["name", "location", "description", "active", "seen", "prioritized", "mu", "sigma_sq"] + _default_fields = ["name", "location", "description", "active", "seen", "prioritized", "mu", "sigma_sq", "updated"] relations_keys = ("viewed", "flags") diff --git a/gavel/static/css/_constants.scss b/gavel/static/css/_constants.scss index 2909eac..e4fd2ab 100644 --- a/gavel/static/css/_constants.scss +++ b/gavel/static/css/_constants.scss @@ -19,7 +19,8 @@ $vote-skip-color: $branding-yellow; $vote-done-color: $branding-green; $admin-color: $branding-dark; $disabled-color: mix($branding-red, white, 25%); -$prioritized-color: mix($branding-green, white, 25%); +$prioritized-color: mix($branding-blue, white, 25%); +$selected-color: mix($branding-orange, white, 25%); $positive-color: $branding-green; $negative-color: $branding-red; $neutral-color: $branding-yellow; diff --git a/gavel/static/css/style.scss b/gavel/static/css/style.scss index 42e3899..83f8604 100644 --- a/gavel/static/css/style.scss +++ b/gavel/static/css/style.scss @@ -1,4 +1,4 @@ -@import 'constants'; +@import './constants'; * { -webkit-box-sizing: border-box; @@ -158,7 +158,6 @@ a.colored { font-family: Rubik; font-style: normal; font-weight: 500; - font-size: 14px; line-height: normal; } @@ -364,14 +363,14 @@ input[type=submit].neutral { color: $dark; } -.disabled { - background-color: $disabled-color; -} - .prioritized { background-color: $prioritized-color!important; } +.disabled { + background-color: $disabled-color!important; +} + .upload-container { margin-top: 0.25rem; margin-bottom: 0.5rem; @@ -1007,7 +1006,10 @@ dl.instructions dt p { } .admin-container { - margin: 36px; + padding: 36px; + height: 100%; + display: flex; + flex-direction: column; } .admin-data-bar span { @@ -1151,6 +1153,11 @@ dl.instructions dt p { // border-radius: 4px 4px 0px 0px !important; } +.admin-tabs { + flex-grow: 1; + min-height: 200px; +} + .admin-table-body { tr { border-bottom: 1px solid #B7B7B7!important; @@ -1201,7 +1208,7 @@ dl.instructions dt p { //border-radius: 4px 4px 0px 0px !important; } -.admin-table > table > thead > tr { +.admin-table-head { border: 0; max-height: 48px !important; @@ -1209,7 +1216,7 @@ dl.instructions dt p { //border-radius: 4px 4px 0px 0px !important; } -.admin-table > table > thead > tr > th { +.admin-table-head-item { border: 0; text-align: left; font-family: Rubik; @@ -1222,28 +1229,6 @@ dl.instructions dt p { color: #000000; } -.admin-table > table > tbody { - background: white; - border: 1px solid #B7B7B7; - box-sizing: border-box; -} - -.admin-table > table > tbody > tr { - border: 0; - border-bottom: 1px solid #B7B7B7; - height: 48px; - max-height: 48px; -} - -.admin-table > table > tbody > tr > td { - border: 0; - font-family: Rubik; - font-style: normal; - font-weight: normal; - line-height: normal; - font-size: 14px; -} - .admin-head-check { width: 48px; max-width: 48px !important; @@ -1383,8 +1368,6 @@ dl.instructions dt p { z-index: 100; left: 0; top: 0; - width: 100%; - height: 100%; overflow: auto; //background: rgba(0, 0, 0, 0.25); -webkit-animation-name: fadeIn; @@ -1398,7 +1381,7 @@ dl.instructions dt p { } .full-modal { - position: absolute; + position: fixed; top: 0; left: 0; width: 100%; @@ -1407,6 +1390,8 @@ dl.instructions dt p { justify-content: center; align-items: center; background: rgba(0, 0, 0, 0.25); + cursor: pointer; + z-index: 2 } .add-modal { @@ -1428,7 +1413,8 @@ dl.instructions dt p { background: #FFFFFF; box-shadow: 0px 2px 6px #B7B7B7; border-radius: 4px; - + z-index: 100; + cursor: default; } .admin-switcher-modal-text { font-family: Rubik; @@ -1523,22 +1509,25 @@ color: #000F9B!important; .normal-purple-14 { font-family: Rubik; -font-style: normal; -font-weight: 500; -font-size: 14px; -line-height: normal; + font-style: normal; + font-weight: 500; + font-size: 14px; + line-height: normal; + color: #000F9B!important; +} -color: #000F9B!important; +.font-16 { + font-size: 16px!important; } .normal-caps-14 { font-family: Rubik; -font-style: normal; -font-weight: 500; -font-size: 14px; -line-height: normal; -text-transform: uppercase; + font-style: normal; + font-weight: 500; + font-size: 14px; + line-height: normal; + text-transform: uppercase; } .normal-caps-red-14 { @@ -1646,6 +1635,7 @@ color: #000000; left: calc(100% - 24px); top: 12px; position: absolute; + cursor: pointer; } .upload-judges-button { @@ -1720,10 +1710,6 @@ p.normal-12 { padding-bottom: 0; } -.admin-container { - height: 100%; -} - .live-active { color: $branding-purple; } @@ -1781,6 +1767,14 @@ iframe { padding-top: 100%; } + +.name-overflow-hidden { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 80%; +} + .responsive-iframe { position: absolute; top: 0; @@ -1838,49 +1832,6 @@ border-radius: 4px; display: inline-block; } -/* Tooltip container */ -.tooltip { - position: relative; - display: inline-block; -} - -/* Tooltip text */ -.tooltip .tooltiptext { - visibility: hidden; - background-color: $branding-darkgrey; - color: #fff; - text-align: center; - padding: 3px 0; - border-radius: 3px; - - /* Position the tooltip text - see examples below! */ - position: absolute; - z-index: 1; -} - -/* Show the tooltip text when you mouse over the tooltip container */ -.tooltip:hover .tooltiptext { - visibility: visible; -} - -.tooltip .tooltiptext { - width: 80px; - bottom: 100%; - left: 50%; - margin-left: -40px; /* Use half of the width (120/2 = 60), to center the tooltip */ -} - -.tooltip .tooltiptext::after { - content: " "; - position: absolute; - top: 100%; /* At the bottom of the tooltip */ - left: 50%; - margin-left: -5px; - border-width: 5px; - border-style: solid; - border-color: black transparent transparent transparent; -} - .h-32 { height: 32px; } @@ -1915,3 +1866,15 @@ border-radius: 4px; .bb { border-bottom: 1px solid #b7b7b7!important; } + +.ag-cell { + outline: none !important; +} + +.ag-theme-balham { + font-size: 14px!important; +} + +.ag-theme-balham .ag-row-selected { + background-color: $selected-color!important +} \ No newline at end of file diff --git a/gavel/static/js/admin/admin_live.js b/gavel/static/js/admin/admin_live.js index 5055682..cf780cf 100644 --- a/gavel/static/js/admin/admin_live.js +++ b/gavel/static/js/admin/admin_live.js @@ -1,5 +1,6 @@ let currentAnnotators; let currentItems; +let socket; /* * BEGIN REFRESH FUNCTION @@ -7,281 +8,519 @@ let currentItems; let token; -function setToken (t) { token = t } +function setToken(t) { token = t } + +function getToken() { return token } const tableBody = document.getElementById("admin-table-body"); const tableHead = document.getElementById("admin-table-head"); -const itemsHead = ` - - - - - Id - Project Name - Location - Description - Mu - Sigma2 - Votes - Seen - Skipped - Actions - -`; - -const annotatorsHead = ` - - - - - Id - Name - Email - Description - Votes - Next (Id) - Prev. (Id) - Updated - Actions - -`; - -const flagsHead = ` - - - - - Id - Judge Name - Project Name - Project Location - Reason - Actions - -`; - -async function clearTable() { - tableHead.innerHTML = ""; - tableBody.innerHTML = ""; -} - -function clearTableBody() { - tableBody.innerHTML = ""; -} - -function clearTableHead() { - tableHead.innerHTML = ""; -} - -async function initTableSorter() { - $('#admin-table').tablesorter({ - cssAsc: 'up', - cssDesc: 'down', - headers: { - '.no-sort': { - sorter: false, - } +let annotatorTable; +let itemTable; +let flagTable; + +let annotatorData; +let itemData; +let flagData; + +window.addEventListener("DOMContentLoaded", () => { + socket = io.connect(location.protocol + "//" + document.domain + ":" + location.port + "/admin") + + initTables(); + + socket.on('connect', () => { + socket.emit('user.connected', { + data: 'User Connected' + }) + }) + + socket.on('connected', (message) => { + console.log(socket.connected); + console.log(message); + }) + + socket.on('annotator.inserted', (message) => standardize(message, handleAnnotatorInsert)) + socket.on('annotator.updated', (message) => standardize(message, handleAnnotatorUpdate)) + socket.on('annotator.deleted', (message) => standardize(message, handleAnnotatorDelete)) + + socket.on('item.inserted', (message) => standardize(message, handleItemInsert)) + socket.on('item.updated', (message) => standardize(message, handleItemUpdate)) + socket.on('item.deleted', (message) => standardize(message, handleItemDelete)) + + socket.on('flag.inserted', (message) => standardize(message, handleFlagInsert)) + socket.on('flag.updated', (message) => standardize(message, handleFlagUpdate)) + socket.on('flag.deleted', (message) => standardize(message, handleFlagDelete)) + + // TODO: Figure this out + // socket.on('setting.inserted', (message) => standardize(message, handleSettingInsert)) + // socket.on('setting.updated', (message) => standardize(message, handleSettingUpdate)) + + console.log("ready: ", socket) +}) + +function standardize({target}, handler) { + console.log(target) + return handler(JSON.parse(target)) +} + +async function updateAndTriggerUpdate(target, {api}) { + console.log(target) + Promise.resolve(api.updateRowData({update: [target]})) +} + +async function handleItemUpdate(target) { + Promise.resolve(updateAndTriggerUpdate(target, itemData)) + .then(socket.emit('item.updated.confirmed')) +} + +async function handleAnnotatorUpdate(target) { + Promise.resolve(updateAndTriggerUpdate(target, annotatorData)) + .then(socket.emit('annotator.updated.confirmed', target)) +} + +async function handleFlagUpdate(target) { + Promise.resolve(updateAndTriggerUpdate(target, flagData)) + .then(socket.emit('flag.updated.confirmed', target)) +} + +function handleSettingUpdate(target) { + sessionButtonState(target) + socket.emit('setting.updated.confirmed', target) +} + +async function handleItemInsert(target) { + Promise.resolve(itemData.api.updateRowData({add: [target]})) + .then(socket.emit('item.inserted.confirmed', target)) +} + +async function handleAnnotatorInsert(target) { + Promise.resolve(annotatorData.api.updateRowData({add: [target]})) + .then(socket.emit('annotator.inserted.confirmed', target)) +} + +async function handleFlagInsert(target) { + Promise.resolve(flagData.api.updateRowData({add: [target]})) + .then(socket.emit('flag.inserted.confirmed', target)) +} + +async function handleSettingInsert(target) { + sessionButtonState(target) + socket.emit('setting.inserted.confirmed', target) +} + +async function handleItemDelete(target) { + Promise.resolve(itemData.api.updateRowData({delete: [target]})) + .then(socket.emit('item.deleted.confirmed')) +} + +async function handleAnnotatorDelete(target) { + Promise.resolve(annotatorData.api.updateRowData({delete: [target]})) + .then(socket.emit('annotator.deleted.confirmed')) +} + +async function handleFlagDelete(target) { + Promise.resolve(flagData.api.updateRowData({delete: [target]})) + .then(socket.emit('flag.deleted.confirmed')) +} + +// async function handleSettingDelete(target) { +// Promise.resolve(settingD.api.updateRowData({delete: [target]})) +// .then(socket.emit('item.deleted.confirmed')) +// } + + +const standardIdWidth = 80 +const standardNameWidth = 150 +const standardLocationWidth = 100 +const standardDescriptionWidth = 400 +const standardDecimalWidth = 80 + +const minIdWidth = 50 +const minDecimalWidth = 80 + +const standardDescriptionOptions = { + cellStyle: {"white-space": "normal", "line-height": 1.5}, + autoHeight: true, + width: standardDescriptionWidth, + minWidth: standardLocationWidth, + filter: true, +} + +const standardDecimalOptions = { + valueFormatter: decimalFormatter, + minWidth: minDecimalWidth, + width: standardDecimalWidth +} + +const standardUpdatedOptions = { + valueFormatter: updatedFormatter, + width: standardLocationWidth +} + +const standardActionOptions = { + headerCheckboxSelection: true, + headerCheckboxSelectionFilteredOnly: true, + checkboxSelection: true, + minWidth: standardNameWidth, + pinned: 'left', + filter: false +} + +const defaultColDef = { + resizable: true, + sortable: true, + unSortIcon: true +} + +const annotatorDefs = [ + {headerName:"Actions", ...standardActionOptions, cellRenderer: AnnotatorActionCellRenderer}, + {headerName:"ID", field: "id", width: standardIdWidth, minWidth: minIdWidth, cellRenderer: AnnotatorIdRenderer}, + {headerName:"Name", field:"name", width: standardNameWidth, minWidth: minDecimalWidth, filter: true}, + {headerName:"Email", field:"email", filter: true}, + {headerName:"Description", field: "description", ...standardDescriptionOptions}, + {headerName:"Votes", field:"votes", minWidth: minDecimalWidth, width: standardDecimalWidth}, + {headerName:"Next (ID)", field:"next_id", width: standardDecimalWidth}, + {headerName:"Prev. (ID)", field:"prev_id", width: standardDecimalWidth}, + {headerName:"Updated", field:"updated", ...standardUpdatedOptions}, +] + +const itemDefs = [ + {headerName:"Actions", ...standardActionOptions, cellRenderer: ItemActionCellRenderer, comparator: itemActionsComparator}, + {headerName:"ID", field: "id", width: standardIdWidth, minWidth: minIdWidth, cellRenderer: ItemIdRenderer}, + {headerName:"Project Name", width: standardNameWidth, minWidth: minDecimalWidth, field:"name", filter: true}, + {headerName:"Location", width: standardLocationWidth, minWidth: minDecimalWidth, field:"location", filter: true}, + {headerName:"Description", field:"description", ...standardDescriptionOptions}, + {headerName:"Mu", field:"mu", ...standardDecimalOptions, sort: 'desc'}, + {headerName:"Sigma^2", field:"sigma_sq", ...standardDecimalOptions}, + {headerName:"Votes", field:"votes", minWidth: minDecimalWidth, width: standardDecimalWidth}, + {headerName:"Seen", field:"seen", minWidth: minDecimalWidth, width: standardDecimalWidth}, + {headerName:"Skipped", field:"skipped", minWidth: minDecimalWidth, width: standardDecimalWidth}, +] + +const flagDefs = [ + {headerName:"Actions", ...standardActionOptions, cellRenderer: FlagActionCellRenderer, comparator: flagActionsComparator}, + {headerName:"ID", field: "id", width: standardIdWidth, minWidth: minIdWidth, cellRenderer: FlagIdRenderer}, + {headerName:"Judge Name", field:"annotator_name", width: standardNameWidth}, + {headerName:"Project Name", field:"item_name", width: standardNameWidth}, + {headerName:"Project Location", field:"item_location", width: standardLocationWidth}, + {headerName:"Reason", field:"reason", width: standardLocationWidth}, +] + +const commonDefs = { + defaultColDef: defaultColDef, + animateRows: true, + rowSelection: 'multiple', + enableCellChangeFlash: true, + suppressCellSelection: true, + onFirstDataRendered: (params) => { + params.api.sizeColumnsToFit(); + } +} + +async function initTables() { + annotatorTable = document.getElementById("annotator-table") + itemTable = document.getElementById("item-table") + flagTable = document.getElementById("flag-table") + + annotatorData = { + ...commonDefs, + columnDefs: annotatorDefs, + } + + itemData = { + ...commonDefs, + columnDefs: itemDefs, + rowClassRules: { + 'disabled': (params) => { return !params.data.active}, + 'prioritized': (params) => { return params.data.prioritized}, } - }); + } + + flagData = { + ...commonDefs, + columnDefs: flagDefs, + } + + new agGrid.Grid(annotatorTable, annotatorData) + new agGrid.Grid(itemTable, itemData) + new agGrid.Grid(flagTable, flagData) + + annotatorData.getRowNodeId = function(data) { + return data.id; + }; + itemData.getRowNodeId = function(data) { + return data.id; + }; + flagData.getRowNodeId = function(data) { + return data.id; + }; } -function setTableHead(head) { - tableHead.innerHTML = head; - $('#admin-table').trigger('updateHeaders'); +function decimalFormatter(params) { + return parseFloat(params.value).toFixed(4) } -async function updateTableSorter() { - $('#admin-table').trigger('update').trigger('updateHeaders'); +function updatedFormatter(params) { + return params.value ? time_ago(new Date(params.value)) : "Never" } -async function populateItems(data) { +function itemActionsComparator(valueA, valueB, nodeA, nodeB, isInverted) { + const { prioritized: prioritizedA, active: activeA } = nodeA.data + const { prioritized: prioritizedB, active: activeB } = nodeB.data + + if (prioritizedA === prioritizedB && activeA === activeB) { + return 0 + } else if (activeA && !activeB) { + return -1 + } else if (!activeA && activeB) { + return 1 + } else if (prioritizedA && !prioritizedB) { + return -1 + } else if (!prioritizedA && prioritizedB) { + return 1 + } else { + return 0 + } +} + +function flagActionsComparator(valueA, valueB, nodeA, nodeB, isInverted) { + const {resolved: resolvedA} = nodeA.data + const {resolved: resolvedB} = nodeB.data + + if (resolvedA && resolvedB) { + return 0 + } else if (resolvedA && !resolvedB) { + return -1 + } else if (!resolvedA && resolvedB) { + return 1 + } else { + return 0 + } +} + +/** + * Action Cell Renderer Utilities + */ +const buildItemActions = ({id, prioritized, active}) => { + return ` +
+ + + +
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ ` +} + +const buildAnnotatorActions = ({id, active}) => { + return ` +
+ + + +
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ ` +} + +const buildFlagActions = ({resolved, id}) => { + return ` +
+
+ + + + +
+
+ ` +} + +/** + * Item Action Cell Renderer + */ +function ItemActionCellRenderer () {} +ItemActionCellRenderer.prototype.init = (params) => { + this.eGui = document.createElement('div') try { - const items = data.items; - const skipped = data.skipped; - const item_count = data.item_count; - const item_counts = data.item_counts; - const viewed = data.viewed; - - for (let i = 0; i < items.length; i++) { - try { - const item = items[i]; - - if (!item.id) - continue; - - const item_template = ` - - - ${item.id} - ${item.name} - ${item.location} - ${item.description} - ${item.mu.toFixed(4)} - ${item.sigma_sq.toFixed(4)} - ${item_counts[item.id]} - ${viewed[item.id].length} - ${skipped[item.id]} - - - - Edit Project - -
- - ${(item.prioritized ? 'Cancel' : 'Prioritize')} - - - -
-
- - ${(item.active ? 'Deactivate' : 'Activate')} - - - -
-
- - Delete - - - -
- - `; - - const newRow = tableBody.insertRow(tableBody.rows.length); - newRow.innerHTML = item_template; - } catch (e) { - console.error(`Error populating item at index ${i}`); - console.log(e) - } + this.eGui.innerHTML = buildItemActions(params.data) + } catch (error) { + console.log(error) + } +} +ItemActionCellRenderer.prototype.getGui = () => { + return this.eGui +} +ItemActionCellRenderer.prototype.refresh = (params) => { + try { + this.eGui.innerHTML = buildItemActions(params.data) + } catch (error) { + console.log(error) + } +} - } +/** + * Annotator Action Cell Renderer + */ +function AnnotatorActionCellRenderer () {} +AnnotatorActionCellRenderer.prototype.init = (params) => { + this.eGui = document.createElement('div') + try { + this.eGui.innerHTML = buildAnnotatorActions(params.data) + } catch (error) { + console.log(error) + } +} +AnnotatorActionCellRenderer.prototype.getGui = () => { + return this.eGui +} +AnnotatorActionCellRenderer.prototype.refresh = (params) => { + try { + this.eGui.innerHTML = buildAnnotatorActions(params.data) + } catch (error) { + console.log(error) + } +} +/** + * Flag Action Cell Renderer + */ +function FlagActionCellRenderer () {} +FlagActionCellRenderer.prototype.init = (params) => { + this.eGui = document.createElement('div') + try { + this.eGui.innerHTML = buildFlagActions(params.data) + } catch (error) { + console.log(error) + } +} +FlagActionCellRenderer.prototype.getGui = () => { + return this.eGui +} +FlagActionCellRenderer.prototype.refresh = (params) => { + try { + this.eGui.innerHTML = buildFlagActions(params.data) + } catch (error) { + console.log(error) + } +} + +/** + * Item ID Renderer + */ +function ItemIdRenderer () {} +ItemIdRenderer.prototype.init = (params) => { + this.eGui = document.createElement('div'); + const val = params.value + this.eGui.innerHTML = `${val}` +} +ItemIdRenderer.prototype.getGui = () => { + return this.eGui +} +ItemIdRenderer.prototype.refresh = (params) => { + const val = params.value + this.eGui.innerHTML = `${val}` +} +ItemIdRenderer.prototype.destroy = () => {}; + +/** + * Annotator ID Renderer + */ +function AnnotatorIdRenderer () {} +AnnotatorIdRenderer.prototype.init = (params) => { + this.eGui = document.createElement('div') + const val = params.value + this.eGui.innerHTML = `${val}` +} +AnnotatorIdRenderer.prototype.getGui = () => { + return this.eGui +} +AnnotatorIdRenderer.prototype.refresh = (params) => { + const val = params.value + this.eGui.innerHTML = `${val}` +} +AnnotatorIdRenderer.prototype.destroy = () => {} + +/** + * Flag ID Renderer + */ +function FlagIdRenderer () {} +FlagIdRenderer.prototype.init = (params) => { + this.eGui = document.createElement('div') + const val = params.value + this.eGui.innerHTML = `${val}` +} +FlagIdRenderer.prototype.getGui = () => { + return this.eGui +} +FlagIdRenderer.prototype.refresh = (params) => { + const val = params.value + this.eGui.innerHTML = `${val}` +} +FlagIdRenderer.prototype.destroy = () => {} + +async function populateItems(data) { + try { + itemData.api.setRowData(data.items) } catch (e) { - console.error("Error populating items"); - console.log(e); + console.error("Error populating items") + console.log(e) } } async function populateAnnotators(data) { try { - const annotators = data.annotators; - const counts = data.counts; - - const now = new Date(); - - for (let i = 0; i < annotators.length; i++) { - try { - const annotator = annotators[i]; - - const annotator_template = ` - - - ${annotator.id} - ${annotator.name} - ${annotator.email} - ${annotator.description} - ${(counts[annotator.id] || 0)} - ${(annotator.next_id || 'None')} - ${(annotator.prev_id || 'None')} - ${(annotator.updated ? (((now - (Date.parse(annotator.updated) - now.getTimezoneOffset() * 60 * 1000)) / 60) / 1000).toFixed(0) + " min ago" : "Undefined")} - - - - Edit Judge - -
- - Send Email - - - -
-
- - ${(annotator.active ? 'De-Activate' : 'Activate')} - - - -
-
- - - Delete - - -
- - `; - const newRow = tableBody.insertRow(tableBody.rows.length); - newRow.innerHTML = annotator_template; - } catch (e) { - console.error(`Error populating annotator at index ${i}`); - console.log(e) - } - } - + annotatorData.api.setRowData(data.annotators) } catch (e) { - console.error("Error populating annotators"); - console.log(e); + console.error("Error populating annotators") + console.log(e) } - } async function populateFlags(data) { try { - const flags = data.flags; - const flag_count = data.flags; - - for (let i = 0; i < flags.length; i++) { - try { - const flag = flags[i]; - - const flag_template = ` - - - ${flag.id} - ${flag.annotator_name} - ${flag.item_name} - ${flag.item_location} - ${flag.reason} - -
- ${(flag.resolved) ? '' : ''} - - - -
- - `; - const newRow = tableBody.insertRow(tableBody.rows.length); - newRow.innerHTML = flag_template; - } catch (e) { - console.error(`Error populating flag at index ${i}`); - console.log(e); - } - } - + flagData.api.setRowData(data.flags) } catch (e) { - console.error("Error populating flags"); - console.log(e); + console.error("Error populating flags") + console.log(e) } } @@ -297,67 +536,62 @@ async function spawnTable(id) { await data; } }).then(async (data) => { - switch(id) { + switch (id) { case "items": Promise.all([ - clearTableBody(), populateItems(data) ]); break; case "annotators": Promise.all([ - clearTableBody(), populateAnnotators(data) ]); break; case "flags": Promise.all([ - clearTableBody(), populateFlags(data) ]); break; } - }).then(() => { - updateTableSorter(); - }); + }) } async function refresh() { - const data = $.ajax({ - url: "/admin/auxiliary", - type: "get", - dataType: "json", - error: function (error) { - return error; - }, - success: async function (data) { - await data; - } - }).then((data) => { - const flag_count = data.flag_count; - const item_count = data.item_count; - const votes = data.votes; - const sigma = data.average_sigma; - const seen = data.average_seen; - - // Populate vote count - let vote_count = document.getElementById("total-votes"); - vote_count.innerText = votes; - - // Populate total active projects - let total_active = document.getElementById("total-active"); - total_active.innerText = item_count; - - // Populate avg. sigma^2 - let average_sigma = document.getElementById("average-sigma"); - average_sigma.innerText = sigma.toFixed(4); - - let average_seen = document.getElementById("average-seen"); - average_seen.innerText = seen.toFixed(2); - }); + const data = $.ajax({ + url: "/admin/auxiliary", + type: "get", + dataType: "json", + error: function (error) { + return error; + }, + success: async function (data) { + await data; + } + }).then((data) => { + const flag_count = data.flag_count; + const item_count = data.item_count; + const votes = data.votes; + const sigma = data.average_sigma; + const seen = data.average_seen; + + // Populate vote count + let vote_count = document.getElementById("total-votes"); + vote_count.innerText = votes; + + // Populate total active projects + let total_active = document.getElementById("total-active"); + total_active.innerText = item_count; + + // Populate avg. sigma^2 + let average_sigma = document.getElementById("average-sigma"); + average_sigma.innerText = sigma.toFixed(4); + + let average_seen = document.getElementById("average-seen"); + average_seen.innerText = seen.toFixed(2); + }); } /* @@ -365,192 +599,262 @@ async function refresh() { * */ function toggleSelector() { - const selectorModal = document.getElementById("selector"); - selectorModal.style.display = selectorModal.style.display === "block" ? "none" : "block"; + const selectorModal = document.getElementById("selector"); + selectorModal.style.display = selectorModal.style.display === "block" ? "none" : "block"; } function showTab(e) { - const content = document.getElementById("admin-switcher-content"); - const batch = document.getElementById("batchPanel"); - currentTab = e; - content.innerText = "none"; - batch.style.display = "none"; - localStorage.setItem("currentTab", e); - clearTable(); - switch (localStorage.getItem("currentTab")) { - case "annotators": - content.innerText = "Manage Judges"; - batch.style.display = "inline-block"; - setTableHead(annotatorsHead); - break; - case "items": - content.innerText = "Manage Projects"; - batch.style.display = "inline-block"; - setTableHead(itemsHead); - break; - case "flags": - content.innerText = "Manage Reports"; - setTableHead(flagsHead); - break; - default: - content.innerText = "Manage Reports"; - setTableHead(flagsHead); - break; - } - setAddButtonState(); - triggerTableUpdate(); + const content = document.getElementById("admin-switcher-content"); + const batch = document.getElementById("batchPanel"); + + const annotators = document.getElementById("annotator-table") + const items = document.getElementById("item-table") + const flags = document.getElementById("flag-table"); + + annotators.style.display = "none" + items.style.display = "none" + flags.style.display = "none" + + currentTab = e; + content.innerText = "none"; + batch.style.display = "none"; + localStorage.setItem("currentTab", e); + + switch (localStorage.getItem("currentTab")) { + case "annotators": + content.innerText = "Manage Judges"; + batch.style.display = "inline-block"; + annotators.style.display = "block" + break; + case "items": + content.innerText = "Manage Projects"; + batch.style.display = "inline-block"; + items.style.display = "block" + break; + case "flags": + content.innerText = "Manage Flags"; + flags.style.display = "block" + break; + default: + content.innerText = "Manage Flags"; + flags.style.display = "block" + break; + } + setAddButtonState(); + triggerTableUpdate(); } function setAddButtonState() { - const tab = localStorage.getItem("currentTab"); - const text = document.getElementById('add-text'); - const add = document.getElementById('add'); - if (tab === "annotators") { - text.innerText = "+ Add Judges"; - text.onclick = function () { - openModal('add-judges') - }; - //text.addEventListener('onclick', openModal('add-judges')); - } - if (tab === "items") { - text.innerText = "+ Add Projects"; - text.onclick = function () { - openModal('add-projects') - }; - //text.addEventListener('onclick', openModal('add-projects')); - } - if (tab === "flags") { - text.innerText = ""; - text.onclick = null; - } + const tab = localStorage.getItem("currentTab"); + const text = document.getElementById('add-text'); + const add = document.getElementById('add'); + if (tab === "annotators") { + text.innerText = "+ Add Judges"; + text.onclick = function () { + openModal('add-judges') + }; + //text.addEventListener('onclick', openModal('add-judges')); + } + if (tab === "items") { + text.innerText = "+ Add Projects"; + text.onclick = function () { + openModal('add-projects') + }; + //text.addEventListener('onclick', openModal('add-projects')); + } + if (tab === "flags") { + text.innerText = ""; + text.onclick = null; + } } +// function sessionButtonState(settings) { +// console.log("test") +// const button = document.getElementById("sessionButton") +// const queued = !!settings.filter((setting) => { return setting.key === "queued" && setting.value === "true"}) +// const closed = !!settings.filter((setting) => { return setting.key === "closed" && setting.value === "true"}) +// const formHolder = document.getElementById("judgeSettingFormHolder") + +// const state = closed ? "closed" : queued ? "queued" : "open"; + +// switch(state) { +// case("closed"): +// const closeform = ` +//
+// +// +// +//
+// `; +// button.classList = "normal-white-18 noborder admin-judging-active" +// formHolder.innerHTML = closeform +// document.getElementById("actionInput").value = "Open" +// button.innerText = "Start Session" +// button.onclick = document.getElementById('admin-judge-setting-form').submit() +// break; +// case("queued"): +// const queueform = ` +//
+// +// +//
+// `; +// button.classList = "normal-white-18 noborder admin-judging-active" +// formHolder.innerHTML = queueform +// document.getElementById("actionInput").value = "dequeue" +// button.innerText = "Stop Soft Close" +// button.onclick = document.getElementById('admin-judge-setting-form').submit() +// break; +// case("open"): +// button.classList = "normal-white-18 noborder admin-judging-inactive" +// button.onclick = openModal("stop-session") +// break; +// default: +// break; +// } +// } + function openModal(modal) { - $("body").find(".modal-wrapper").css('display', 'none'); + $("body").find(".modal-wrapper").css('display', 'none'); - var dumdum; - modal !== 'close' && modal ? document.getElementById(modal).style.display = 'block' : dumdum = 'dum'; + var dumdum; + modal !== 'close' && modal ? document.getElementById(modal).style.display = 'block' : dumdum = 'dum'; } -$(".full-modal").click(function (event) { - //if you click on anything except the modal itself or the "open modal" link, close the modal - if (!$(event.target).hasClass('admin-modal-content') && $(event.target).hasClass('full-modal')) { - openModal('close') - } - if (!$(event.target).hasClass('admin-switcher-modal') && - !$(event.target).parents('*').hasClass('admin-switcher') && - !$(event.target).hasClass('admin-switcher')) { - $("body").find("#selector").css('display', 'none') - } -}); - -function checkAllReports() { - let check = document.getElementById('check-all-reports'); - if (check.checked) { - $('#admin-table').find('input[type=checkbox]').each(function () { - this.checked = true; - }); - check.checked = true; - } else { - $('#admin-table').find('input[type=checkbox]:checked').each(function () { - this.checked = false; - }); - check.checked = false; - } -} +$('#sessionForm').click(async function () { -function checkAllProjects() { - let check = document.getElementById('check-all-projects'); - if (check.checked) { - $('#admin-table').find('input[type=checkbox]').each(function () { - this.checked = true; - }); - check.checked = true; - } else { - $('#admin-table').find('input[type=checkbox]:checked').each(function () { - this.checked = false; - }); - check.checked = false; - } -} +}) -function checkAllJudges() { - let check = document.getElementById('check-all-judges'); - if (check.checked) { - $('#admin-table').find('input[type=checkbox]').each(function () { - this.checked = true; - }); - check.checked = true; - } else { - $('#admin-table').find('input[type=checkbox]:checked').each(function () { - this.checked = false; - }); - check.checked = false; - } -} +$(document).ready(() => { + showTab(localStorage.getItem("currentTab") || "flags"); + $(".full-modal").click(function (event) { + //if you click on anything except the modal itself or the "open modal" link, close the modal + if(!$(event.target).closest('.admin-modal-content').length && !$(event.target).is('.admin-modal-content') && !$(event.target).is('#add-text')) { + openModal('close') + } + }); -const judgeCheckboxValues = JSON.parse(localStorage.getItem('judgeCheckboxValues')) || {}; -const $judgeCheckboxes = $("#judge-check-container :checkbox"); -$judgeCheckboxes.on("change", function() { - $judgeCheckboxes.each(function() { - judgeCheckboxValues[this.id] = this.checked; - }); - localStorage.setItem("judgeCheckboxValues", JSON.stringify(judgeCheckboxValues)) -}); - -const projectCheckboxValues = JSON.parse(localStorage.getItem('projectCheckboxValues')) || {}; -const $projectCheckboxes = $("#project-check-container :checkbox"); -$projectCheckboxes.on("change", function() { - $projectCheckboxes.each(function() { - projectCheckboxValues[this.id] = this.checked; - }); - localStorage.setItem("projectCheckboxValues", JSON.stringify(projectCheckboxValues)) -}); + window.onclick = function(e) { + if (!$(e.target).closest('#switcher').length) { + var dropdown = document.getElementById("selector"); + if (dropdown.style.display === "block") { + dropdown.style.display = "none" + } + } + } -let judgeIds = []; -let projectIds = []; -let form = null; -$('#batchDelete').click(async function () { + let judgeIds = []; + let projectIds = []; + let form = null; + $('#batchDelete').click(async function () { const tab = localStorage.getItem("currentTab"); projectIds = []; judgeIds = []; form = null; + let selectedRows = [] if (tab === 'items') { - form = document.getElementById('batchDeleteItems'); + form = document.getElementById('batchDeleteItems'); + selectedRows = itemData.api.getSelectedRows() + console.log("items", selectedRows) } else if (tab === 'annotators') { - form = document.getElementById('batchDeleteAnnotators'); + form = document.getElementById('batchDeleteAnnotators'); + selectedRows = annotatorData.api.getSelectedRows() + console.log("annotators", selectedRows) } - $('#admin-table').find('input[type="checkbox"]:checked').each(function () { - form.innerHTML = form.innerHTML + ''; + selectedRows.map((row) => { + form.innerHTML = form.innerHTML + ''; }); try { - form.serializeArray() - } catch { - + form.serializeArray() + } catch (e) { + console.log(e) } const full = await form; full.submit(); -}); + }); -$('#batchDisable').click(async function () { + $('#batchDisable').click(async function () { const tab = localStorage.getItem("currentTab"); projectIds = []; judgeIds = []; form = null; + let selectedRows = [] if (tab === 'items') { - form = document.getElementById('batchDisableItems'); + form = document.getElementById('batchDisableItems'); + selectedRows = itemData.api.getSelectedRows() + console.log("items", selectedRows) } else if (tab === 'annotators') { - form = document.getElementById('batchDisableAnnotators'); + form = document.getElementById('batchDisableAnnotators'); + selectedRows = annotatorData.api.getSelectedRows() + console.log("annotators", selectedRows) } - $('#admin-table').find('input[type="checkbox"]:checked').each(function () { - form.innerHTML = form.innerHTML + ''; + selectedRows.map((row) => { + form.innerHTML = form.innerHTML + ''; }); try { - form.serializeArray(); - } catch { - + form.serializeArray(); + } catch (e) { + console.log(e) } const full = await form; full.submit(); -}); + }); + + +}) + +function time_ago(time) { + + switch (typeof time) { + case 'number': + break; + case 'string': + time = +new Date(time); + break; + case 'object': + if (time.constructor === Date) time = time.getTime(); + break; + default: + time = +new Date(); + } + const time_formats = [ + [60, 'seconds', 1], // 60 + [120, '1 minute ago', '1 minute from now'], // 60*2 + [3600, 'minutes', 60], // 60*60, 60 + [7200, '1 hour ago', '1 hour from now'], // 60*60*2 + [86400, 'hours', 3600], // 60*60*24, 60*60 + [172800, 'Yesterday', 'Tomorrow'], // 60*60*24*2 + [604800, 'days', 86400], // 60*60*24*7, 60*60*24 + [1209600, 'Last week', 'Next week'], // 60*60*24*7*4*2 + [2419200, 'weeks', 604800], // 60*60*24*7*4, 60*60*24*7 + [4838400, 'Last month', 'Next month'], // 60*60*24*7*4*2 + [29030400, 'months', 2419200], // 60*60*24*7*4*12, 60*60*24*7*4 + [58060800, 'Last year', 'Next year'], // 60*60*24*7*4*12*2 + [2903040000, 'years', 29030400], // 60*60*24*7*4*12*100, 60*60*24*7*4*12 + [5806080000, 'Last century', 'Next century'], // 60*60*24*7*4*12*100*2 + [58060800000, 'centuries', 2903040000] // 60*60*24*7*4*12*100*20, 60*60*24*7*4*12*100 + ]; + const seconds = (+new Date() - time) / 1000, + token = 'ago', + list_choice = 1; + + if (seconds == 0) { + return 'Just now' + } + if (seconds < 0) { + seconds = Math.abs(seconds); + token = 'from now'; + list_choice = 2; + } + let i = 0, + format; + while (format = time_formats[i++]) + if (seconds < format[0]) { + if (typeof format[2] == 'string') + return format[list_choice]; + else + return Math.floor(seconds / format[2]) + ' ' + format[1] + ' ' + token; + } + return time; +} \ No newline at end of file diff --git a/gavel/static/js/admin/admin_service.js b/gavel/static/js/admin/admin_service.js new file mode 100644 index 0000000..e69de29 diff --git a/gavel/static/js/admin/jquery-3.3.1.min.js b/gavel/static/js/admin/jquery-3.3.1.min.js deleted file mode 100644 index 4d9b3a2..0000000 --- a/gavel/static/js/admin/jquery-3.3.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w(" + + + +{% assets 'admin_js' %} + +{% endassets %} +{% endblock %} {% block content %} -
- -
-
- TOTAL VOTES -
{{ votes }}
-
-
- TOTAL PROJECTS -
{{ item_count }}
-
-
- AVG. SIGMA SQUARED -
-
-
- AVG. SEEN -
+
+
+

Votes: {{ votes }}

- Reports: {{ flag_count }} + Flags: {{ flag_count }}
diff --git a/gavel/templates/vote.html b/gavel/templates/vote.html index af40b0d..ef3b9c8 100644 --- a/gavel/templates/vote.html +++ b/gavel/templates/vote.html @@ -12,6 +12,7 @@ border: 0; } +

Evaluate the following project.

@@ -50,5 +51,6 @@

Evaluate the following project.

{% with prev=prev, next=next %} {% include "./vote_components/vote_modal.html" %} {% endwith %} +
{% endblock %} diff --git a/gavel/utils.py b/gavel/utils.py index 46b3dbe..5ad06c1 100644 --- a/gavel/utils.py +++ b/gavel/utils.py @@ -20,7 +20,8 @@ import asyncio -loop = asyncio.get_event_loop() +loop = asyncio.new_event_loop() +asyncio.set_event_loop(loop) def async_action(f): @wraps(f) diff --git a/runserver.py b/runserver.py index 32528e9..3fbfe48 100644 --- a/runserver.py +++ b/runserver.py @@ -4,7 +4,7 @@ # details. if __name__ == '__main__': - from gavel import app + from gavel import socketio from gavel.settings import PORT import os @@ -15,7 +15,7 @@ app.jinja_env.cache = {} - app.run( + socketio.run( host='0.0.0.0', port=PORT, extra_files=extra_files,