mirror of
https://github.com/documize/community.git
synced 2025-07-23 15:19:42 +02:00
WIP
This commit is contained in:
parent
7c34053e3d
commit
af80b39cd0
6 changed files with 1248 additions and 1167 deletions
|
@ -40,7 +40,6 @@ $color-chip-text: #1b88e3;
|
||||||
$color-symbol-box: #dce5e8;
|
$color-symbol-box: #dce5e8;
|
||||||
$color-symbol-icon: #a4b8be;
|
$color-symbol-icon: #a4b8be;
|
||||||
|
|
||||||
|
|
||||||
.color-white {
|
.color-white {
|
||||||
color: $color-white !important;
|
color: $color-white !important;
|
||||||
}
|
}
|
||||||
|
|
42
core/api/entity/nulltime.go
Normal file
42
core/api/entity/nulltime.go
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
// Source: https://github.com/lib/pq/blob/b269bd035a727d6c1081f76e7a239a1b00674c40/encode.go#L521
|
||||||
|
//
|
||||||
|
// Copyright (c) 2011-2013, 'pq' Contributors Portions Copyright (C) 2011 Blake Mizerany
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
|
||||||
|
// to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
// and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
// Package entity provides types that mirror database tables.
|
||||||
|
package entity
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql/driver"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NullTime represents a time.Time that may be null. NullTime implements the
|
||||||
|
// sql.Scanner interface so it can be used as a scan destination, similar to
|
||||||
|
// sql.NullString.
|
||||||
|
type NullTime struct {
|
||||||
|
Time time.Time
|
||||||
|
Valid bool // Valid is true if Time is not NULL
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scan implements the Scanner interface.
|
||||||
|
func (nt *NullTime) Scan(value interface{}) error {
|
||||||
|
nt.Time, nt.Valid = value.(time.Time)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Value implements the driver Valuer interface.
|
||||||
|
func (nt NullTime) Value() (driver.Value, error) {
|
||||||
|
if !nt.Valid {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return nt.Time, nil
|
||||||
|
}
|
|
@ -69,6 +69,7 @@ CREATE TABLE IF NOT EXISTS `useraction` (
|
||||||
`refid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
`refid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
||||||
`orgid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
`orgid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
||||||
`userid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
`userid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
||||||
|
`documentid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
||||||
`requestorid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
`requestorid` CHAR(16) NOT NULL COLLATE utf8_bin,
|
||||||
`actiontype` INT NOT NULL DEFAULT 0,
|
`actiontype` INT NOT NULL DEFAULT 0,
|
||||||
`note` NVARCHAR(2000) NOT NULL DEFAULT '',
|
`note` NVARCHAR(2000) NOT NULL DEFAULT '',
|
||||||
|
@ -81,6 +82,7 @@ CREATE TABLE IF NOT EXISTS `useraction` (
|
||||||
CONSTRAINT pk_id PRIMARY KEY (id),
|
CONSTRAINT pk_id PRIMARY KEY (id),
|
||||||
INDEX `idx_useraction_refid` (`refid` ASC),
|
INDEX `idx_useraction_refid` (`refid` ASC),
|
||||||
INDEX `idx_useraction_userid` (`userid` ASC),
|
INDEX `idx_useraction_userid` (`userid` ASC),
|
||||||
|
INDEX `idx_useraction_documentid` (`documentid` ASC),
|
||||||
INDEX `idx_useraction_requestorid` (`requestorid` ASC))
|
INDEX `idx_useraction_requestorid` (`requestorid` ASC))
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
|
DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
|
||||||
ENGINE = InnoDB;
|
ENGINE = InnoDB;
|
||||||
|
|
38
core/utility/strings.go
Normal file
38
core/utility/strings.go
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
|
||||||
|
//
|
||||||
|
// This software (Documize Community Edition) is licensed under
|
||||||
|
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
|
||||||
|
//
|
||||||
|
// You can operate outside the AGPL restrictions by purchasing
|
||||||
|
// Documize Enterprise Edition and obtaining a commercial license
|
||||||
|
// by contacting <sales@documize.com>.
|
||||||
|
//
|
||||||
|
// https://documize.com
|
||||||
|
|
||||||
|
package utility
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Conjoin returns "Suzzane, Fatima and Brian" from string of items.
|
||||||
|
func Conjoin(conj string, items []string) string {
|
||||||
|
if len(items) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if len(items) == 1 {
|
||||||
|
return items[0]
|
||||||
|
}
|
||||||
|
if len(items) == 2 { // "a and b" not "a, and b"
|
||||||
|
return items[0] + " " + conj + " " + items[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
sep := ", "
|
||||||
|
pieces := []string{items[0]}
|
||||||
|
for _, item := range items[1 : len(items)-1] {
|
||||||
|
pieces = append(pieces, sep, item)
|
||||||
|
}
|
||||||
|
pieces = append(pieces, sep, conj, " ", items[len(items)-1])
|
||||||
|
|
||||||
|
return strings.Replace(strings.Join(pieces, ""), ", and ", " and ", 1)
|
||||||
|
}
|
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue