liquid_feedback_frontend

annotate app/main/draft/new.lua @ 1578:13d99b41059e

find changesets by author, revision, files, or words in the commit message
Handle lat/lon as numeric values
author bsw
date Mon Dec 07 17:00:20 2020 +0100 (2020-12-07)
parents 90af594c803e
children 59cbb870253c
rev   line source
bsw@1496 1 local issue
bsw@1496 2 local area
bsw@1496 3 local area_id
bsw/jbe@0 4
bsw@1496 5 local issue_id = param.get("issue_id", atom.integer)
bsw@1496 6 if issue_id then
bsw@1496 7 issue = Issue:new_selector():add_where{"id=?",issue_id}:single_object_mode():exec()
bsw@1496 8 issue:load_everything_for_member_id(app.session.member_id)
bsw@1496 9 area = issue.area
bsw@1496 10 else
bsw@1496 11 area_id = param.get("area_id", atom.integer)
bsw@1496 12 if area_id then
bsw@1496 13 area = Area:new_selector():add_where{"id=?",area_id}:single_object_mode():exec()
bsw@1496 14 area:load_delegation_info_once_for_member_id(app.session.member_id)
bsw@1534 15 else
bsw@1534 16 local firstlife_id = param.get("firstlife_id")
bsw@1534 17 if firstlife_id then
bsw@1534 18 area = Area:new_selector():join("unit", nil, "unit.id = area.unit_id"):add_where{"attr->>'firstlife_id'=?",firstlife_id}:single_object_mode():exec()
bsw@1534 19 area:load_delegation_info_once_for_member_id(app.session.member_id)
bsw@1534 20 area_id = area.id
bsw@1534 21 end
bsw@1496 22 end
bsw@1496 23 end
bsw@1496 24
bsw@1496 25 local polling = param.get("polling", atom.boolean)
bsw@1496 26
bsw@1496 27 local policy_id = param.get("policy_id", atom.integer)
bsw@1496 28 local policy
bsw@1496 29
bsw@1496 30 local preview = param.get("preview")
bsw@1496 31
bsw@1496 32 if #(slot.get_content("error")) > 0 then
bsw@1496 33 preview = false
bsw@1496 34 end
bsw@1496 35
bsw@1496 36 if policy_id then
bsw@1496 37 policy = Policy:by_id(policy_id)
bsw@1135 38 end
bsw@1135 39
bsw@1535 40 local callback = param.get("callback")
bsw@1496 41
bsw@1496 42
bsw@1496 43 local initiative_id = param.get("initiative_id")
bsw@1496 44 local initiative = Initiative:by_id(initiative_id)
bsw@1496 45 local draft
bsw@1496 46 if initiative then
bsw@1496 47 initiative:load_everything_for_member_id(app.session.member_id)
bsw@1496 48 initiative.issue:load_everything_for_member_id(app.session.member_id)
bsw@1496 49
bsw@1496 50 if initiative.issue.closed then
bsw@1496 51 slot.put_into("error", _"This issue is already closed.")
bsw@1496 52 return
bsw@1496 53 elseif initiative.issue.half_frozen then
bsw@1496 54 slot.put_into("error", _"This issue is already frozen.")
bsw@1496 55 return
bsw@1496 56 elseif initiative.issue.phase_finished then
bsw@1496 57 slot.put_into("error", _"Current phase is already closed.")
bsw@1496 58 return
bsw/jbe@1309 59 end
bsw@1496 60
bsw@1496 61 draft = initiative.current_draft
bsw@1496 62 if config.initiative_abstract then
bsw@1496 63 draft.abstract = string.match(draft.content, "(.+)<!%--END_OF_ABSTRACT%-->")
bsw@1496 64 if draft.abstract then
bsw@1496 65 draft.content = string.match(draft.content, "<!%--END_OF_ABSTRACT%-->(.*)")
bsw@1496 66 end
bsw@1496 67 end
bsw@1496 68 end
bsw@1496 69
bsw@1496 70 if not initiative and not issue and not area then
bsw@1496 71 ui.heading{ content = _"Missing parameter" }
bsw@1496 72 return false
bsw/jbe@1309 73 end
bsw@95 74
bsw/jbe@0 75 ui.form{
bsw/jbe@1309 76 record = draft,
bsw@1495 77 attr = { class = "vertical section", enctype = 'multipart/form-data' },
bsw/jbe@0 78 module = "draft",
bsw/jbe@0 79 action = "add",
bsw@1496 80 params = {
bsw@1496 81 area_id = area and area.id,
bsw@1496 82 issue_id = issue and issue.id or nil,
bsw@1535 83 initiative_id = initiative_id,
bsw@1535 84 callback = callback
bsw@1496 85 },
bsw/jbe@0 86 routing = {
bsw@95 87 ok = {
bsw/jbe@0 88 mode = "redirect",
bsw/jbe@0 89 module = "initiative",
bsw/jbe@0 90 view = "show",
bsw@1496 91 id = initiative_id
bsw/jbe@0 92 }
bsw/jbe@0 93 },
bsw/jbe@0 94 content = function()
bsw@1045 95
bsw@1560 96 if issue or initiative then
bsw@1560 97 execute.view {
bsw@1560 98 module = "issue", view = "_head", params = {
bsw@1560 99 issue = issue or initiative.issue,
bsw@1560 100 member = app.session.member
bsw@1560 101 }
bsw@1560 102 }
bsw@1560 103 else
bsw@1560 104 execute.view {
bsw@1560 105 module = "area", view = "_head", params = {
bsw@1560 106 area = area,
bsw@1560 107 member = app.session.member
bsw@1560 108 }
bsw@1560 109 }
bsw@1560 110 end
bsw@1560 111
bsw/jbe@1309 112 ui.grid{ content = function()
bsw/jbe@1309 113 ui.cell_main{ content = function()
bsw/jbe@1309 114 ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function()
bsw/jbe@1309 115 ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
bsw@1496 116 if initiative then
bsw@1496 117 ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = initiative.display_name }
bsw@1496 118 elseif param.get("name") then
bsw@1496 119 ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = param.get("name") }
bsw@1496 120 elseif issue then
bsw@1496 121 ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _("New competing initiative in issue '#{issue}'", { issue = issue.name }) }
bsw@1496 122 elseif area then
bsw@1560 123 ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"New issue" }
bsw@1496 124 end
bsw/jbe@1309 125 end }
bsw/jbe@1309 126 ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
bsw@1496 127
bsw@1496 128 -- -------- PREVIEW
bsw/jbe@1309 129 if param.get("preview") then
bsw/jbe@1309 130 ui.sectionRow( function()
bsw@1496 131 if not issue and not initiative then
bsw@1496 132 ui.container { content = policy.name }
bsw@1496 133 end
bsw@1496 134 if param.get("free_timing") then
bsw@1496 135 ui.container { content = param.get("free_timing") }
bsw@1496 136 end
bsw@1496 137 slot.put("<br />")
bsw@1496 138 ui.field.hidden{ name = "policy_id", value = param.get("policy_id") }
bsw@1496 139 ui.field.hidden{ name = "name", value = param.get("name") }
bsw/jbe@1309 140 if config.initiative_abstract then
bsw/jbe@1309 141 ui.field.hidden{ name = "abstract", value = param.get("abstract") }
bsw/jbe@1309 142 ui.container{
bsw/jbe@1309 143 attr = { class = "abstract" },
bsw/jbe@1309 144 content = param.get("abstract")
bsw/jbe@1309 145 }
bsw/jbe@1309 146 slot.put("<br />")
bsw/jbe@1309 147 end
bsw/jbe@1309 148 local draft_text = param.get("content")
bsw/jbe@1309 149 local draft_text = util.wysihtml_preproc(draft_text)
bsw/jbe@1309 150 ui.field.hidden{ name = "content", value = draft_text }
bsw/jbe@1309 151 ui.container{
bsw/jbe@1309 152 attr = { class = "draft" },
bsw/jbe@1309 153 content = function()
bsw/jbe@1309 154 slot.put(draft_text)
bsw/jbe@1309 155 end
bsw/jbe@1309 156 }
bsw/jbe@1309 157 slot.put("<br />")
bsw@95 158
bsw@1495 159 if config.attachments then
bsw@1495 160 local file_upload_session = param.get("file_upload_session") or multirand.string(
bsw@1495 161 32,
bsw@1495 162 '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
bsw@1495 163 )
bsw@1495 164 file_upload_session = string.gsub(file_upload_session, "[^A-Za-z0-9]", "")
bsw@1495 165 ui.field.hidden{ name = "file_upload_session", value = file_upload_session }
bsw@1496 166 if initiative then
bsw@1496 167 local files = File:new_selector()
bsw@1496 168 :left_join("draft_attachment", nil, "draft_attachment.file_id = file.id")
bsw@1496 169 :add_where{ "draft_attachment.draft_id = ?", initiative.current_draft.id }
bsw@1496 170 :reset_fields()
bsw@1496 171 :add_field("file.id")
bsw@1496 172 :add_field("draft_attachment.title")
bsw@1496 173 :add_field("draft_attachment.description")
bsw@1496 174 :add_order_by("draft_attachment.id")
bsw@1496 175 :exec()
bsw@1495 176
bsw@1496 177 if #files > 0 then
bsw@1496 178 ui.container {
bsw@1496 179 content = function()
bsw@1496 180 for i, file in ipairs(files) do
bsw@1496 181 if param.get("file_delete_" .. file.id, atom.boolean) then
bsw@1496 182 ui.field.hidden{ name = "file_delete_" .. file.id, value = "1" }
bsw@1496 183 else
bsw@1496 184 ui.image{ module = "file", view = "show.jpg", id = file.id, params = { preview = true } }
bsw@1496 185 ui.container{ content = function()
bsw@1496 186 ui.tag{ tag = "strong", content = file.title or "" }
bsw@1496 187 end }
bsw@1496 188 ui.container{ content = file.description or "" }
bsw@1496 189 slot.put("<br /><br />")
bsw@1496 190 end
bsw@1495 191 end
bsw@1495 192 end
bsw@1496 193 }
bsw@1496 194 end
bsw@1495 195 end
bsw@1495 196 local filename = encode.file_path(WEBMCP_BASE_PATH, 'tmp', "file_upload-" .. file_upload_session .. ".json")
bsw@1495 197 local fh = io.open(filename, "r")
bsw@1495 198 if fh then
bsw@1495 199 local file_uploads = json.import(fh:read("*a"))
bsw@1495 200 for i, file_upload in ipairs(file_uploads) do
bsw@1495 201 ui.image{ module = "draft", view = "show_file_upload", params = {
bsw@1495 202 file_upload_session = file_upload_session, file_id = file_upload.id, preview = true
bsw@1495 203 } }
bsw@1496 204 ui.container{ content = function()
bsw@1496 205 ui.tag{ tag = "strong", content = file_upload.title or "" }
bsw@1496 206 end }
bsw@1495 207 ui.container{ content = file_upload.description or "" }
bsw@1495 208 slot.put("<br />")
bsw@1495 209 end
bsw@1495 210 end
bsw@1495 211 end
bsw@1495 212
bsw/jbe@1309 213 ui.tag{
bsw/jbe@1309 214 tag = "input",
bsw/jbe@1309 215 attr = {
bsw/jbe@1309 216 type = "submit",
bsw/jbe@1309 217 class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored",
bsw/jbe@1309 218 value = _'Publish now'
bsw/jbe@1309 219 },
bsw/jbe@1309 220 content = ""
bsw/jbe@1309 221 }
bsw/jbe@1309 222 slot.put(" &nbsp; ")
bsw/jbe@1309 223
bsw/jbe@1309 224 ui.tag{
bsw/jbe@1309 225 tag = "input",
bsw/jbe@1309 226 attr = {
bsw/jbe@1309 227 type = "submit",
bsw/jbe@1309 228 name = "edit",
bsw/jbe@1309 229 class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect",
bsw/jbe@1309 230 value = _'Edit again'
bsw/jbe@1309 231 },
bsw/jbe@1309 232 content = ""
bsw/jbe@1309 233 }
bsw/jbe@1309 234 slot.put(" &nbsp; ")
bsw@95 235
bsw/jbe@1309 236 ui.link{
bsw/jbe@1309 237 attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" },
bsw/jbe@1309 238 content = _"Cancel",
bsw@1496 239 module = initiative and "initiative" or "area",
bsw/jbe@1309 240 view = "show",
bsw@1496 241 id = initiative_id or area_id
bsw/jbe@1309 242 }
bsw/jbe@1309 243 end )
bsw@1045 244
bsw@1496 245 -- -------- EDIT
bsw/jbe@1309 246 else
bsw@1496 247
bsw@1496 248 if not issue_id and not initiative_id then
bsw@1496 249 local tmp = { { id = -1, name = "" } }
bsw@1496 250 for i, allowed_policy in ipairs(area.allowed_policies) do
bsw@1496 251 if not allowed_policy.polling or app.session.member:has_polling_right_for_unit_id(area.unit_id) then
bsw@1496 252 tmp[#tmp+1] = allowed_policy
bsw@1496 253 end
bsw@1496 254 end
bsw@1496 255 ui.container{ content = _"Please choose a policy for the new issue:" }
bsw@1496 256 ui.field.select{
bsw@1496 257 name = "policy_id",
bsw@1496 258 foreign_records = tmp,
bsw@1496 259 foreign_id = "id",
bsw@1496 260 foreign_name = "name",
bsw@1496 261 value = param.get("policy_id", atom.integer) or area.default_policy and area.default_policy.id
bsw@1496 262 }
bsw@1496 263 if policy and policy.free_timeable then
bsw@1496 264 local available_timings
bsw@1496 265 if config.free_timing and config.free_timing.available_func then
bsw@1496 266 available_timings = config.free_timing.available_func(policy)
bsw@1496 267 if available_timings == false then
bsw@1496 268 slot.put_into("error", "error in free timing config")
bsw@1496 269 return false
bsw@1496 270 end
bsw@1496 271 end
bsw@1496 272 ui.heading{ level = 4, content = _"Free timing:" }
bsw@1496 273 if available_timings then
bsw@1496 274 ui.field.select{
bsw@1496 275 name = "free_timing",
bsw@1496 276 foreign_records = available_timings,
bsw@1496 277 foreign_id = "id",
bsw@1496 278 foreign_name = "name",
bsw@1496 279 value = param.get("free_timing")
bsw@1496 280 }
bsw@1496 281 else
bsw/jbe@1309 282 ui.field.text{
bsw@1496 283 name = "free_timing",
bsw@1496 284 value = param.get("free_timing")
bsw/jbe@1309 285 }
bsw@1496 286 end
bsw/jbe@1309 287 end
bsw@1496 288 end
bsw@1496 289
bsw@1496 290 if issue and issue.policy.polling and app.session.member:has_polling_right_for_unit_id(area.unit_id) then
bsw@1496 291 slot.put("<br />")
bsw@1496 292 ui.field.boolean{ name = "polling", label = _"No admission needed", value = polling }
bsw@1496 293 end
bsw@1496 294
bsw@1496 295 if not initiative then
bsw@1496 296 ui.container{ attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label mdl-card__fullwidth" }, content = function ()
bsw@1496 297 ui.field.text{
bsw@1496 298 attr = { id = "lf-initiative__name", class = "mdl-textfield__input" },
bsw@1496 299 label_attr = { class = "mdl-textfield__label", ["for"] = "lf-initiative__name" },
bsw@1496 300 label = _"Title",
bsw@1496 301 name = "name",
bsw@1496 302 value = param.get("name")
bsw@1496 303 }
bsw@1496 304 end }
bsw@1496 305 end
bsw@1495 306
bsw@1496 307 if config.initiative_abstract then
bsw@1496 308 ui.container { content = _"Enter abstract:" }
bsw@1496 309 ui.container{ attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--expandable mdl-textfield__fullwidth" }, content = function()
bsw@1496 310 ui.field.text{
bsw@1496 311 name = "abstract",
bsw@1496 312 multiline = true,
bsw@1496 313 attr = { id = "abstract", style = "height: 20ex; width: 100%;" },
bsw@1496 314 value = param.get("abstract")
bsw@1496 315 }
bsw@1496 316 end }
bsw@1496 317 end
bsw@1496 318
bsw@1496 319 ui.container { content = _"Enter your proposal and/or reasons:" }
bsw@1496 320 ui.field.wysihtml{
bsw@1496 321 name = "content",
bsw@1496 322 multiline = true,
bsw@1496 323 attr = { id = "draft", style = "height: 50ex; width: 100%;" },
bsw@1496 324 value = param.get("content")
bsw@1496 325 }
bsw@1496 326 if not issue or issue.state == "admission" or issue.state == "discussion" then
bsw@1496 327 ui.container { content = _"You can change your text again anytime during admission and discussion phase" }
bsw@1496 328 else
bsw@1496 329 ui.container { content = _"You cannot change your text again later, because this issue is already in verfication phase!" }
bsw@1496 330 end
bsw@1496 331
bsw@1496 332 slot.put("<br />")
bsw@1496 333 if config.attachments then
bsw@1496 334 local file_upload_session = param.get("file_upload_session") or multirand.string(
bsw@1496 335 32,
bsw@1496 336 '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
bsw@1496 337 )
bsw@1496 338 file_upload_session = string.gsub(file_upload_session, "[^A-Za-z0-9]", "")
bsw@1496 339 ui.field.hidden{ name = "file_upload_session", value = file_upload_session }
bsw@1496 340 if initiative then
bsw@1495 341 local files = File:new_selector()
bsw@1495 342 :left_join("draft_attachment", nil, "draft_attachment.file_id = file.id")
bsw@1495 343 :add_where{ "draft_attachment.draft_id = ?", initiative.current_draft.id }
bsw@1495 344 :reset_fields()
bsw@1495 345 :add_field("file.id")
bsw@1495 346 :add_field("draft_attachment.title")
bsw@1495 347 :add_field("draft_attachment.description")
bsw@1495 348 :add_order_by("draft_attachment.id")
bsw@1495 349 :exec()
bsw@1495 350
bsw@1495 351 if #files > 0 then
bsw@1495 352 ui.container {
bsw@1495 353 content = function()
bsw@1495 354 for i, file in ipairs(files) do
bsw@1495 355 ui.image{ module = "file", view = "show.jpg", id = file.id, params = { preview = true } }
bsw@1496 356 ui.container{ content = function()
bsw@1496 357 ui.tag{ tag = "strong", content = file.title or "" }
bsw@1496 358 end }
bsw@1495 359 ui.container{ content = file.description or "" }
bsw@1495 360 ui.field.boolean{ label = _"delete", name = "file_delete_" .. file.id, value = param.get("file_delete_" .. file.id) and true or false }
bsw@1495 361 slot.put("<br /><br />")
bsw@1495 362 end
bsw@1495 363 end
bsw@1495 364 }
bsw@1495 365 end
bsw@1496 366 end
bsw@1496 367 local filename = encode.file_path(WEBMCP_BASE_PATH, 'tmp', "file_upload-" .. file_upload_session .. ".json")
bsw@1496 368 local fh = io.open(filename, "r")
bsw@1496 369 if fh then
bsw@1496 370 local file_uploads = json.import(fh:read("*a"))
bsw@1496 371 for i, file_upload in ipairs(file_uploads) do
bsw@1496 372 ui.image{ module = "draft", view = "show_file_upload", params = {
bsw@1496 373 file_upload_session = file_upload_session, file_id = file_upload.id, preview = true
bsw@1496 374 } }
bsw@1496 375 ui.container{ content = function()
bsw@1496 376 ui.tag{ tag = "strong", content = file_upload.title or "" }
bsw@1496 377 end }
bsw@1496 378 ui.container{ content = file_upload.description or "" }
bsw@1496 379 ui.field.boolean{ label = _"delete", name = "file_upload_delete_" .. file_upload.id }
bsw@1496 380 slot.put("<br />")
bsw@1495 381 end
bsw@1496 382 end
bsw@1496 383 ui.container{ attr = { id = "file_upload_template", style = "display: none;" }, content = function()
bsw@1496 384 ui.field.text{ label = _"Title", name = "__ID_title__" }
bsw@1496 385 ui.field.text{ label = _"Description", name = "__ID_description__" }
bsw@1496 386 ui.field.image{ field_name = "__ID_file__" }
bsw@1496 387 end }
bsw@1496 388 ui.container{ attr = { id = "file_upload" }, content = function()
bsw@1496 389 end }
bsw@1496 390 ui.field.hidden{ attr = { id = "file_upload_last_id" }, name = "file_upload_last_id" }
bsw@1496 391 ui.script{ script = [[ var file_upload_id = 1; ]] }
bsw@1496 392 ui.tag{ tag = "a", content = _"Attach image", attr = {
bsw@1496 393 href = "#",
bsw@1496 394 onclick = "var html = document.getElementById('file_upload_template').innerHTML; html = html.replace('__ID_file__', 'file_' + file_upload_id); html = html.replace('__ID_title__', 'title_' + file_upload_id); html = html.replace('__ID_description__', 'description_' + file_upload_id); var el = document.createElement('div'); el.innerHTML = html; document.getElementById('file_upload').appendChild(el); document.getElementById('file_upload_last_id').value = file_upload_id; file_upload_id++; return false;"
bsw@1496 395 } }
bsw@1496 396 slot.put("<br />")
bsw@1496 397
bsw@1496 398 slot.put("<br />")
bsw@1495 399
bsw@1496 400 end
bsw@1045 401
bsw@1496 402 ui.tag{
bsw@1496 403 tag = "input",
bsw@1496 404 attr = {
bsw@1496 405 type = "submit",
bsw@1496 406 name = "preview",
bsw@1496 407 class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored",
bsw@1496 408 value = _'Preview'
bsw@1496 409 },
bsw@1496 410 content = ""
bsw@1496 411 }
bsw@1496 412 slot.put(" &nbsp; ")
bsw@1496 413
bsw@1496 414 ui.link{
bsw@1496 415 content = _"Cancel",
bsw@1496 416 module = initiative and "initiative" or issue and "issue" or "index",
bsw@1497 417 view = area and not issue and "index" or "show",
bsw@1496 418 id = initiative_id or issue_id,
bsw@1496 419 params = { area = area_id, unit = area and area.unit_id or nil },
bsw@1496 420 attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" }
bsw@1496 421 }
bsw@1496 422
bsw/jbe@1309 423 end
bsw/jbe@1309 424 end }
bsw/jbe@1309 425 end }
bsw/jbe@1309 426 end }
bsw@1520 427
bsw@1520 428 if config.map or config.firstlife then
bsw@1520 429 ui.cell_sidebar{ content = function()
bsw@1520 430 ui.container{ attr = { class = "mdl-special-card map mdl-shadow--2dp" }, content = function()
bsw@1575 431 local location = param.get("location")
bsw@1578 432 local lat = param.get("lat", atom.number)
bsw@1578 433 local lon = param.get("lon", atom.number)
bsw@1575 434 if lat and lon then
bsw@1577 435 location = json.export(json.object{
bsw@1575 436 type = "Point",
bsw@1576 437 coordinates = json.array{ lon, lat }
bsw@1575 438 })
bsw@1575 439 end
bsw@1575 440 ui.field.location{ name = "location", value = location }
bsw@1520 441 end }
bsw@1520 442 end }
bsw@1520 443 end
bsw@1520 444
bsw@1550 445 if config.firstlife then
bsw@1550 446 ui.field.hidden{ name = "external_reference", value = param.get("external_reference") }
bsw@1550 447 end
bsw@1550 448
bsw/jbe@1309 449 end }
bsw/jbe@0 450 end
bsw/jbe@0 451 }

Impressum / About Us